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

wjp's starmap fuel range calculator and actual consumption fix

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@305 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2002-12-03 21:07:48 +00:00
parent 5f118170ab
commit 3900cd1d4d
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
0.2:
- Starmap fuel range calculator and actual consumption matches now
- Collision detection is now pixel-perfect (fixes Sa-Matra, BUTT missile, etc)
- Fixed lander position sign bug which was introduced by previous fixes
- Initial display of planet surface on landing is at correct position
sc2/TODO
-2
View File
@@ -83,8 +83,6 @@ Glitches (don't crash the game, medium priority):
- lander speed varies per computer
- "device used successfully" and "device usage failed" sounds are identical
(the failure one)
- The fuel range calculator on the starmap does not work correctly.
Estimate too small. May be a rounding error.
- spathi blink and other spathi animation may go out of sync
- subtitles may go past the bottom boundary
- If you win a Melee, and then are blown up yourself, the sound loops
sc2/src/sc2code/hyper.c
+12 -7
View File
@@ -31,7 +31,7 @@ void WaitForNoInput (SIZE Duration);
static FRAME hyperstars[3];
static COLORMAP hypercmaps[2];
static BYTE fuel_ticks;
static COUNT hyper_dx, hyper_dy;
static COUNT hyper_dx, hyper_dy, hyper_extra;
void
MoveSIS (PSIZE pdx, PSIZE pdy)
@@ -94,6 +94,7 @@ MoveSIS (PSIZE pdx, PSIZE pdy)
{
COUNT cur_fuel_ticks;
COUNT hyper_dist;
DWORD adj_dx, adj_dy;
if (new_dx < 0)
new_dx = -new_dx;
@@ -102,11 +103,14 @@ MoveSIS (PSIZE pdx, PSIZE pdy)
new_dy = -new_dy;
hyper_dy += new_dy;
hyper_dist = square_root (
(DWORD)hyper_dx * hyper_dx
+ (DWORD)hyper_dy * hyper_dy
);
/* These macros are also used in the fuel estimate on the starmap. */
adj_dx = LOGX_TO_UNIVERSE(16 * hyper_dx);
adj_dy = MAX_Y_UNIVERSE - LOGY_TO_UNIVERSE(16 * hyper_dy);
hyper_dist = square_root (adj_dx * adj_dx + adj_dy * adj_dy)
+ hyper_extra;
cur_fuel_ticks = hyper_dist >> 4;
if (cur_fuel_ticks > (COUNT)fuel_ticks)
{
#ifndef TESTING
@@ -114,7 +118,8 @@ MoveSIS (PSIZE pdx, PSIZE pdy)
#endif /* TESTING */
if (cur_fuel_ticks > 0x00FF)
{
hyper_dx = hyper_dist & ((1 << 4) - 1);
hyper_dx = 0;
hyper_extra = hyper_dist & ((1 << 4) - 1);
hyper_dy = 0;
cur_fuel_ticks = 0;
}
@@ -296,7 +301,7 @@ LoadHyperData (void)
BOOLEAN
LoadHyperspace (void)
{
hyper_dx = hyper_dy = 0;
hyper_dx = hyper_dy = hyper_extra = 0;
fuel_ticks = 1;
GLOBAL (ShipStamp.origin.x) = -MAX_X_UNIVERSE;