Added issue #7

Bitl · Dec 14, 2018 · 2be7341 · 2be7341
1 parent 23cb1ae
commit 2be7341
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 2 deletions.
diff --git a/Build/Enhanced-Changes.txt b/Build/Enhanced-Changes.txt
@@ -1,3 +1,13 @@
+Black Shades Enhanced v1.1.2 and Black Shades Revenge Mod v1.0.1
+- Fixed an issue where you could spam open the main menu by pressing ESC (z33ky:mainmenu-spam)
+- Fixed the shotgun's laser (z33ky:shotgun-laser)
+- Fix Sniper zoom orientation (z33ky:sniper-zoom-orientation)
+- Fixed an issue where the Sniper Rifle zooms out on idle (issue #7)
+- Revenge Mod: Fixed an issue where the sniper rifle dosen't zoom out on death.
+
+Dev stuff:
+- The mods are now compilable on Linux! (z33ky:fix-linux)
+
 Black Shades Enhanced v1.1.1R and Black Shades Revenge Mod v1.0
 - Added a seperate gameplay mod called "Revenge Mod", where the player has to defend themselves against assassins.
 

diff --git a/Build/blackshades.exe b/Build/blackshades.exe
diff --git a/Build/blackshades_revenge.exe b/Build/blackshades_revenge.exe
diff --git a/blackshades/Source/GameLoop.cpp b/blackshades/Source/GameLoop.cpp
@@ -318,6 +318,9 @@ static void DoSDLKey(Game *g, SDL_Event *event)
 	}
 
 	mackey = sdlkeymap[event->key.keysym.sym];
+
+	if(mackey == MAC_CONTROL_KEY)
+		press = SDL_GetModState() & (KMOD_LCTRL | KMOD_RCTRL);
 
 	if (mackey != -1) {
 		index = mackey / 8;

diff --git a/blackshades_revenge/Source/GameLoop.cpp b/blackshades_revenge/Source/GameLoop.cpp
@@ -318,6 +318,9 @@ static void DoSDLKey(Game *g, SDL_Event *event)
 	}
 
 	mackey = sdlkeymap[event->key.keysym.sym];
+
+	if(mackey == MAC_CONTROL_KEY)
+		press = SDL_GetModState() & (KMOD_LCTRL | KMOD_RCTRL);
 
 	if (mackey != -1) {
 		index = mackey / 8;

diff --git a/blackshades_revenge/Source/GameTick.cpp b/blackshades_revenge/Source/GameTick.cpp
@@ -3719,9 +3719,12 @@ void 	Game::Tick(){
 
 							if(person[whichhit].type==zombietype)person[whichhit].maxhealth-=10;
 
-							/*
 							if(whichhit==0){
 
+								zoom=0;
+
+								/*
+
 								bulletstrength=1;
 
 								person[0].health=100;
@@ -3742,7 +3745,8 @@ void 	Game::Tick(){
 
 								SoundFX::inst()->playFX(gSampleSet[bodywhacksound], gLoc, 1.0);
 								//alSourcei(gSourceID[src_bodywhacksound], AL_BUFFER, gSampleSet[bodywhacksound]);
-							}*/
+								*/
+							}
 
 							person[whichhit].longdead=1;