adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EventHandler checks CurStarDescPtr before dereference - fixes #347

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@955 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2003-05-11 15:10:16 +00:00
parent 1b4cf3a986
commit 04b9e2a433
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.3: Changes towards version 0.3:
- EventHandler checks CurStarDescPtr before dereferencing it (bug #347)
- Oscilloscope now has borders (bug #307 part 4) -Mika - Oscilloscope now has borders (bug #307 part 4) -Mika
- Flashing rects are no longer constrained to even-numbered pixels on the - Flashing rects are no longer constrained to even-numbered pixels on the
y axis; fixes bug #255, from Nic y axis; fixes bug #255, from Nic
sc2/src/sc2code/starcon.c
+4
View File
@@ -681,6 +681,7 @@ EventHandler (BYTE selector)
case KOHR_AH_GENOCIDE_EVENT: case KOHR_AH_GENOCIDE_EVENT:
if (!GET_GAME_STATE (KOHR_AH_FRENZY) if (!GET_GAME_STATE (KOHR_AH_FRENZY)
&& LOBYTE (GLOBAL (CurrentActivity)) == IN_INTERPLANETARY && LOBYTE (GLOBAL (CurrentActivity)) == IN_INTERPLANETARY
&& CurStarDescPtr
&& CurStarDescPtr->Index == SAMATRA_DEFINED) && CurStarDescPtr->Index == SAMATRA_DEFINED)
AddEvent (RELATIVE_EVENT, 0, 7, 0, KOHR_AH_GENOCIDE_EVENT); AddEvent (RELATIVE_EVENT, 0, 7, 0, KOHR_AH_GENOCIDE_EVENT);
else else
@@ -694,6 +695,7 @@ EventHandler (BYTE selector)
break; break;
case ZOQFOT_DISTRESS_EVENT: case ZOQFOT_DISTRESS_EVENT:
if (LOBYTE (GLOBAL (CurrentActivity)) == IN_INTERPLANETARY if (LOBYTE (GLOBAL (CurrentActivity)) == IN_INTERPLANETARY
&& CurStarDescPtr
&& CurStarDescPtr->Index == ZOQFOT_DEFINED) && CurStarDescPtr->Index == ZOQFOT_DEFINED)
AddEvent (RELATIVE_EVENT, 0, 7, 0, ZOQFOT_DISTRESS_EVENT); AddEvent (RELATIVE_EVENT, 0, 7, 0, ZOQFOT_DISTRESS_EVENT);
else else
@@ -704,6 +706,7 @@ EventHandler (BYTE selector)
break; break;
case ZOQFOT_DEATH_EVENT: case ZOQFOT_DEATH_EVENT:
if (LOBYTE (GLOBAL (CurrentActivity)) == IN_INTERPLANETARY if (LOBYTE (GLOBAL (CurrentActivity)) == IN_INTERPLANETARY
&& CurStarDescPtr
&& CurStarDescPtr->Index == ZOQFOT_DEFINED) && CurStarDescPtr->Index == ZOQFOT_DEFINED)
AddEvent (RELATIVE_EVENT, 0, 7, 0, ZOQFOT_DEATH_EVENT); AddEvent (RELATIVE_EVENT, 0, 7, 0, ZOQFOT_DEATH_EVENT);
else if (GET_GAME_STATE (ZOQFOT_DISTRESS)) else if (GET_GAME_STATE (ZOQFOT_DISTRESS))
@@ -740,6 +743,7 @@ EventHandler (BYTE selector)
break; break;
case SPATHI_SHIELD_EVENT: case SPATHI_SHIELD_EVENT:
if (LOBYTE (GLOBAL (CurrentActivity)) == IN_INTERPLANETARY if (LOBYTE (GLOBAL (CurrentActivity)) == IN_INTERPLANETARY
&& CurStarDescPtr
&& CurStarDescPtr->Index == SPATHI_DEFINED) && CurStarDescPtr->Index == SPATHI_DEFINED)
AddEvent (RELATIVE_EVENT, 0, 7, 0, SPATHI_SHIELD_EVENT); AddEvent (RELATIVE_EVENT, 0, 7, 0, SPATHI_SHIELD_EVENT);
else else