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

Removed another dependency on the VGA register byte in COLOR.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3364 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2009-11-28 20:03:05 +00:00
parent ef66877a29
commit cf6a9378ef
2 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/ship.c
+1
View File
@@ -431,6 +431,7 @@ spawn_ship (STARSHIP *StarShipPtr)
ShipElementPtr->turn_wait = 0; ShipElementPtr->turn_wait = 0;
ShipElementPtr->thrust_wait = 0; ShipElementPtr->thrust_wait = 0;
ShipElementPtr->life_span = NORMAL_LIFE; ShipElementPtr->life_span = NORMAL_LIFE;
ShipElementPtr->colorCycleIndex = 0;
SetPrimType (&DisplayArray[ShipElementPtr->PrimIndex], STAMP_PRIM); SetPrimType (&DisplayArray[ShipElementPtr->PrimIndex], STAMP_PRIM);
ShipElementPtr->current.image.farray = RDPtr->ship_data.ship; ShipElementPtr->current.image.farray = RDPtr->ship_data.ship;
sc2/src/uqm/ships/utwig/utwig.c
+34 -35
View File
@@ -285,7 +285,8 @@ utwig_preprocess (ELEMENT *ElementPtr)
ElementPtr->life_span - (NORMAL_LIFE + 1)); ElementPtr->life_span - (NORMAL_LIFE + 1));
ProcessSound (SetAbsSoundIndex ( ProcessSound (SetAbsSoundIndex (
StarShipPtr->RaceDescPtr->ship_data.ship_sounds, 1), ElementPtr); StarShipPtr->RaceDescPtr->ship_data.ship_sounds, 1),
ElementPtr);
} }
if (!(StarShipPtr->cur_status_flags & SPECIAL)) if (!(StarShipPtr->cur_status_flags & SPECIAL))
@@ -300,61 +301,59 @@ utwig_preprocess (ELEMENT *ElementPtr)
StarShipPtr->special_counter = StarShipPtr->special_counter =
StarShipPtr->RaceDescPtr->characteristics.special_wait; StarShipPtr->RaceDescPtr->characteristics.special_wait;
ProcessSound (SetAbsSoundIndex ( ProcessSound (SetAbsSoundIndex (
StarShipPtr->RaceDescPtr->ship_data.ship_sounds, 2), ElementPtr); StarShipPtr->RaceDescPtr->ship_data.ship_sounds, 2),
ElementPtr);
} }
} }
lpPrim = &(GLOBAL (DisplayArray))[ElementPtr->PrimIndex]; lpPrim = &(GLOBAL (DisplayArray))[ElementPtr->PrimIndex];
if (StarShipPtr->special_counter == 0) if (StarShipPtr->special_counter == 0)
{ {
SetPrimColor (lpPrim, BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1C, 0x00), 0x78)); // The shield is off.
SetPrimColor (lpPrim,
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x1C, 0x00), 0x78));
ElementPtr->colorCycleIndex = 0;
ElementPtr->life_span = NORMAL_LIFE; ElementPtr->life_span = NORMAL_LIFE;
SetPrimType (lpPrim, STAMP_PRIM); SetPrimType (lpPrim, STAMP_PRIM);
} }
else else
{ {
static const COLOR color_tab[] = // The shield is on.
/* Originally, this table also contained the now commented out
* entries. It then used some if statements to skip over these.
* The current behaviour is the same as the old behavior,
* but I am not sure that the old behavior was intended. - SvdB
*/
static const COLOR colorTable[] =
{ {
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7a),
//BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7b),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7c),
//BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7d),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7e),
//BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7f),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x00, 0x00), 0x2a), BUILD_COLOR (MAKE_RGB15 (0x1F, 0x00, 0x00), 0x2a),
BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2b), //BUILD_COLOR (MAKE_RGB15 (0x1B, 0x00, 0x00), 0x2b),
BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2c), BUILD_COLOR (MAKE_RGB15 (0x17, 0x00, 0x00), 0x2c),
BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2d), BUILD_COLOR (MAKE_RGB15 (0x13, 0x00, 0x00), 0x2d),
BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2e), BUILD_COLOR (MAKE_RGB15 (0x0F, 0x00, 0x00), 0x2e),
BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2f), //BUILD_COLOR (MAKE_RGB15 (0x0B, 0x00, 0x00), 0x2f),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7a),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x11, 0x00), 0x7b),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0E, 0x00), 0x7c),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x0A, 0x00), 0x7d),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x07, 0x00), 0x7e),
BUILD_COLOR (MAKE_RGB15 (0x1F, 0x03, 0x00), 0x7f),
}; };
const size_t colorTableCount =
#define NUM_TAB_COLORS (sizeof (color_tab) / sizeof (color_tab[0])) sizeof colorTable / sizeof colorTable[0];
COUNT color_index = 0;
COLOR c;
if (StarShipPtr->weapon_counter == 0) if (StarShipPtr->weapon_counter == 0)
++StarShipPtr->weapon_counter; ++StarShipPtr->weapon_counter;
c = COLOR_256 (GetPrimColor (lpPrim)); // colorCycleIndex is actually 1 higher than the entry in colorTable
if (c >= 0x78) // which is currently used, as it is 0 when the shield is off,
{ // and we don't want to skip over the first entry of the table.
if ((c += 2) > 0x7E) ElementPtr->colorCycleIndex++;
c = 0x2A; if (ElementPtr->colorCycleIndex == colorTableCount + 1)
} ElementPtr->colorCycleIndex = 1;
else if (c < 0x2E)
{ SetPrimColor (lpPrim, colorTable[ElementPtr->colorCycleIndex - 1]);
if (++c == 0x2B)
c = 0x2C;
}
else
c = 0x7a;
if (c <= 0x2f && c >= 0x2a)
color_index = (COUNT)c - 0x2a;
else /* color is between 0x7a and 0x7f */
color_index = (COUNT)(c - 0x7a) + (NUM_TAB_COLORS >> 1);
SetPrimColor (lpPrim, color_tab[color_index]);
ElementPtr->life_span = NORMAL_LIFE + 1; ElementPtr->life_span = NORMAL_LIFE + 1;
SetPrimType (lpPrim, STAMPFILL_PRIM); SetPrimType (lpPrim, STAMPFILL_PRIM);