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

Fixed bug 283 (Blazer-form Guardian being drained by DOGI).

Browse Source 
From chmmravatar.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1155 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2003-08-31 01:59:21 +00:00
parent 7f6d392126
commit 11081809fd
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+3
View File
@@ -1,4 +1,7 @@
Changes towards version 0.3: Changes towards version 0.3:
- Guardian in Blazer mode being drained by DOGI will no longer
result in a non-blazer Guardian with Blazer effects. Original sc2 bug.
(bug #283); from chmmravatar
- 'CREW' and 'BATT' instead of icons in combat screen when using - 'CREW' and 'BATT' instead of icons in combat screen when using
PC-style menus (bug #308); from Paxtez PC-style menus (bug #308); from Paxtez
- New shipyard SCRAP system with scrapping confirmation - New shipyard SCRAP system with scrapping confirmation
sc2/WhatsNew
+2
View File
@@ -72,6 +72,8 @@ BUGFIXES
- Various minor graphics glitch fixes - Various minor graphics glitch fixes
- Crew death on planet is now counted properly in all cases - Crew death on planet is now counted properly in all cases
- Mouse cursor is now hidden in fullscreen mode - Mouse cursor is now hidden in fullscreen mode
- Guardian in Blazer mode being drained by DOGI will no longer
result in a non-blazer Guardian with Blazer effects.
INTERNAL CHANGES INTERNAL CHANGES
sc2/src/sc2code/ships/androsyn/androsyn.c
+10 -10
View File
@@ -331,25 +331,25 @@ androsynth_postprocess (PELEMENT ElementPtr)
if ((StarShipPtr->cur_status_flags & SPECIAL) if ((StarShipPtr->cur_status_flags & SPECIAL)
|| StarShipPtr->RaceDescPtr->ship_info.energy_level == 0) || StarShipPtr->RaceDescPtr->ship_info.energy_level == 0)
{ {
StarShipPtr->RaceDescPtr->characteristics.special_wait =
StarShipPtr->RaceDescPtr->characteristics.turn_wait;
StarShipPtr->RaceDescPtr->characteristics.turn_wait = BLAZER_TURN_WAIT;
StarShipPtr->RaceDescPtr->characteristics.energy_regeneration = StarShipPtr->RaceDescPtr->characteristics.energy_regeneration =
(BYTE)BLAZER_DEGENERATION; (BYTE)BLAZER_DEGENERATION;
StarShipPtr->energy_counter = ENERGY_WAIT; StarShipPtr->energy_counter = ENERGY_WAIT;
ElementPtr->mass_points = BLAZER_MASS;
ship_collision_func[WHICH_SIDE(ElementPtr->state_flags)] = ElementPtr->collision_func;
{
ElementPtr->collision_func = blazer_collision;
}
if (StarShipPtr->cur_status_flags & SPECIAL) if (StarShipPtr->cur_status_flags & SPECIAL)
{ {
ProcessSound (SetAbsSoundIndex ( ProcessSound (SetAbsSoundIndex (
/* COMET_ON */ StarShipPtr->RaceDescPtr->ship_data.ship_sounds, 1),
StarShipPtr->RaceDescPtr->ship_data.ship_sounds, 1), ElementPtr); ElementPtr); /* COMET_ON */
ElementPtr->turn_wait = 0; ElementPtr->turn_wait = 0;
ElementPtr->thrust_wait = 0; ElementPtr->thrust_wait = 0;
StarShipPtr->RaceDescPtr->characteristics.special_wait =
StarShipPtr->RaceDescPtr->characteristics.turn_wait;
ElementPtr->mass_points = BLAZER_MASS;
StarShipPtr->RaceDescPtr->characteristics.turn_wait
= BLAZER_TURN_WAIT;
ship_collision_func[WHICH_SIDE(ElementPtr->state_flags)]
= ElementPtr->collision_func;
ElementPtr->collision_func = blazer_collision;
} }
} }