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

Fuel give-away bug fixed, from BlckKnght.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@307 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2002-12-04 00:05:25 +00:00
parent 613e7d9211
commit 95ef96c00b
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
0.2: 0.2:
- Fuel giveaway bug fixed, from steve@blckknght.org
- Starmap fuel range calculator and actual consumption matches now - Starmap fuel range calculator and actual consumption matches now
- Collision detection is now pixel-perfect (fixes Sa-Matra, BUTT missile, etc) - Collision detection is now pixel-perfect (fixes Sa-Matra, BUTT missile, etc)
- Fixed lander position sign bug which was introduced by previous fixes - Fixed lander position sign bug which was introduced by previous fixes
sc2/src/sc2code/comm/melnorm/melnorm.c
+3 -7
View File
@@ -688,7 +688,9 @@ DoBuy (RESPONSE_REF R)
else if (PLAYER_SAID (R, buy_25_fuel)) else if (PLAYER_SAID (R, buy_25_fuel))
needed_credit = 25; needed_credit = 25;
else if (PLAYER_SAID (R, fill_me_up)) else if (PLAYER_SAID (R, fill_me_up))
needed_credit = (COUNT)~0; needed_credit = (capacity - GLOBAL_SIS (FuelOnBoard)
+ FUEL_TANK_SCALE - 1)
/ FUEL_TANK_SCALE;
if (needed_credit == 0) if (needed_credit == 0)
{ {
@@ -700,12 +702,6 @@ DoBuy (RESPONSE_REF R)
} }
else else
{ {
if (needed_credit == (COUNT)~0
&& (needed_credit = (capacity / FUEL_TANK_SCALE)
- (GLOBAL_SIS (FuelOnBoard)
/ FUEL_TANK_SCALE)) == 0)
needed_credit = 1;
if (GLOBAL_SIS (FuelOnBoard) / FUEL_TANK_SCALE if (GLOBAL_SIS (FuelOnBoard) / FUEL_TANK_SCALE
+ needed_credit > capacity / FUEL_TANK_SCALE) + needed_credit > capacity / FUEL_TANK_SCALE)
{ {