Menu
▾
▴
timewarp-commit — Shows each and every CVS commit - high volume
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(136) |
Dec
(218) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(214) |
Feb
(208) |
Mar
(186) |
Apr
(15) |
May
(3) |
Jun
(35) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
(1) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(58) |
Aug
(123) |
Sep
(31) |
Oct
(9) |
Nov
|
Dec
(1) |
| 2006 |
Jan
(25) |
Feb
(10) |
Mar
(25) |
Apr
(61) |
May
|
Jun
(78) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <geo...@us...> - 2003-11-18 16:59:26
|
Update of /cvsroot/timewarp/source/twgui
In directory sc8-pr-cvs1:/tmp/cvs-serv14821
Modified Files:
area.cpp twgui.cpp twgui.h
Log Message:
small bug fix / and easier to switch between text
Index: area.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/area.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** area.cpp 28 Oct 2003 00:00:37 -0000 1.8
--- area.cpp 18 Nov 2003 16:59:00 -0000 1.9
***************
*** 66,70 ****
tmpbmp = load_bitmap(objname, 0);
bmp = clone_bitmap(bpp, tmpbmp, scale);
! destroy_bitmap(tmpbmp);
return bmp;
--- 66,71 ----
tmpbmp = load_bitmap(objname, 0);
bmp = clone_bitmap(bpp, tmpbmp, scale);
! if (tmpbmp)
! destroy_bitmap(tmpbmp);
return bmp;
Index: twgui.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twgui.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** twgui.cpp 28 Oct 2003 00:00:38 -0000 1.8
--- twgui.cpp 18 Nov 2003 16:59:00 -0000 1.9
***************
*** 479,482 ****
--- 479,485 ----
if (textinfo[0] == 0) // empty text
{
+ Nlines = 1; // even empty text has 1 line to hold the cursor.
+ linestart[1] = 0;
+
scroll->y = 0;
scroll->yselect = 0;
***************
*** 591,594 ****
--- 594,602 ----
iline = Nlines-1;
+ if (iline < 0)
+ {
+ tw_error("getcharpos : Nlines < 0 should not happen");
+ }
+
// the last line should be handled with care ... (you don't know it's length, only that it stops)
if (iline == Nlines-1)
***************
*** 740,743 ****
--- 748,758 ----
+ void TextEditBox::text_reset(char *newtext)
+ {
+ textinfo->textinfo = newtext;
+ text = newtext;
+ text_reset();
+ }
+
void TextEditBox::text_reset()
{
***************
*** 772,783 ****
ys = scroll.yselect;
scroll.calculate();
// if scrolled, then update the position in the text
if (scroll.yselect != ys)
{
- if (scroll.yselect > textinfo->Nlines-1)
- scroll.yselect = textinfo->Nlines-1;
-
// update the charpos ...
textinfo->changeline(&charpos, ys, scroll.yselect);
--- 787,807 ----
ys = scroll.yselect;
+ // perhaps this could happen if someone changes the text pointer.
+ if (ys < 0)
+ ys = 0;
+ if (ys > textinfo->Nlines-1)
+ ys = textinfo->Nlines-1;
+
scroll.calculate();
// if scrolled, then update the position in the text
+ if (scroll.yselect > textinfo->Nlines-1)
+ scroll.yselect = textinfo->Nlines-1;
+
+ if (scroll.yselect < 0)
+ scroll.yselect = 0;
+
if (scroll.yselect != ys)
{
// update the charpos ...
textinfo->changeline(&charpos, ys, scroll.yselect);
***************
*** 2416,2421 ****
//blit(bmp, backgr, 0, 0, 0, 0, bmp->w, bmp->h);
! destroy_bitmap(backgr);
! backgr = areareserve->bmp(fname);
}
--- 2440,2451 ----
//blit(bmp, backgr, 0, 0, 0, 0, bmp->w, bmp->h);
! BITMAP *newb;
! newb = areareserve->bmp(fname);
!
! if (newb)
! {
! destroy_bitmap(backgr);
! backgr = newb;
! }
}
Index: twgui.h
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twgui.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** twgui.h 28 Oct 2003 00:00:38 -0000 1.7
--- twgui.h 18 Nov 2003 16:59:00 -0000 1.8
***************
*** 208,211 ****
--- 208,212 ----
void text_reset();
+ void text_reset(char *newtext);
};
|
|
From: <geo...@us...> - 2003-11-18 16:57:52
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs1:/tmp/cvs-serv14626 Modified Files: mship.cpp Log Message: small animate_predict bug Index: mship.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mship.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mship.cpp 15 Nov 2003 11:04:17 -0000 1.18 --- mship.cpp 18 Nov 2003 16:57:48 -0000 1.19 *************** *** 894,898 **** pos = normalize(pos); sprite_index = get_index(angle); ! if (sprite_index > sprite->frames()) sprite_index = 0; animate(frame); --- 894,898 ---- pos = normalize(pos); sprite_index = get_index(angle); ! if (sprite_index >= sprite->frames()) sprite_index = 0; animate(frame); |
|
From: <you...@us...> - 2003-11-17 00:02:46
|
Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv6352/source/melee
Modified Files:
mfleet.cpp
Log Message:
in Fleet class, made sorting by origin faster
Index: mfleet.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mfleet.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** mfleet.cpp 15 Nov 2003 20:48:06 -0000 1.14
--- mfleet.cpp 17 Nov 2003 00:01:59 -0000 1.15
***************
*** 355,358 ****
--- 355,374 ----
};
+ struct _originDecending : public binary_function<ShipType *, ShipType *, bool> {
+ bool operator()(ShipType * x, ShipType * y) {
+ if (x && y)
+ return (x->origin > y->origin);
+ else
+ return false;
+ }
+ };
+ struct _originAscending : public binary_function<ShipType *, ShipType *, bool> {
+ bool operator()(ShipType * x, ShipType * y) {
+ if (x && y)
+ return (x->origin < y->origin);
+ else
+ return false;
+ }
+ };
void Fleet::Sort(SortingMethod sortMethod, bool ascending, int startIndex, int endIndex) {
***************
*** 394,406 ****
break;
-
- /*case SORTING_METHOD_TWCOST:
- strcpy(_fleetsort_ini_item, "TWCost");
- if (ascending)
- sort(_begin, _end, _NumericConfigDescending());
- else
- sort(_begin, _end, _NumericConfigAscending());
- break;*/
-
case SORTING_METHOD_NAME1:
strcpy(_fleetsort_ini_item, "Name1");
--- 410,413 ----
***************
*** 428,436 ****
case SORTING_METHOD_ORIGIN:
- strcpy(_fleetsort_ini_item, "Origin");
if (ascending)
! sort(_begin, _end, _AlphabeticConfigAscending());
else
! sort(_begin, _end, _AlphabeticConfigDescending());
break;
--- 435,442 ----
case SORTING_METHOD_ORIGIN:
if (ascending)
! sort(_begin, _end, _originAscending());
else
! sort(_begin, _end, _originDecending());
break;
|
Update of /cvsroot/timewarp/source/newships
In directory sc8-pr-cvs1:/tmp/cvs-serv2688/source/newships
Modified Files:
shpbubbo.cpp shpclofl.cpp shpconho.cpp shpgerhe.cpp
shphotsp.cpp shpiceco.cpp shplyrwa.cpp
Log Message:
Fixed not virtual destructor bugs.
Fixed uninitialized varriable use bugs.
Fixed calculation damage in one of the ships
Index: shpbubbo.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpbubbo.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shpbubbo.cpp 2 Nov 2003 12:11:53 -0000 1.12
--- shpbubbo.cpp 15 Nov 2003 20:48:07 -0000 1.13
***************
*** 240,244 ****
case 1: dx = -8; break;
case 2: dx = 8; break;
! case 3: dx = 12; }
BMIRV = new BubalosMIRV(dx, 54 * Direction, FireAngle,weaponVelocity,
--- 240,246 ----
case 1: dx = -8; break;
case 2: dx = 8; break;
! case 3: dx = 12; break;
! default: tw_error("Unexpected value of weapon_offset"); dx=0;break;
! }
BMIRV = new BubalosMIRV(dx, 54 * Direction, FireAngle,weaponVelocity,
Index: shpclofl.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpclofl.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpclofl.cpp 26 Oct 2003 10:43:17 -0000 1.8
--- shpclofl.cpp 15 Nov 2003 20:48:07 -0000 1.9
***************
*** 1005,1009 ****
{
STACKTRACE
! int i;
// ok .. if the shot hits a planet, it wont be damaged, but greatly accelerated
--- 1005,1009 ----
{
STACKTRACE
! int i = 0;
// ok .. if the shot hits a planet, it wont be damaged, but greatly accelerated
Index: shpconho.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpconho.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpconho.cpp 31 Oct 2003 13:58:34 -0000 1.7
--- shpconho.cpp 15 Nov 2003 20:48:07 -0000 1.8
***************
*** 120,124 ****
STACKTRACE;
! int shield_color = 9; // Blue
// int i, bar_x, bar_y, shield_panel;
--- 120,124 ----
STACKTRACE;
! // int shield_color = 9; // Blue
// int i, bar_x, bar_y, shield_panel;
Index: shpgerhe.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpgerhe.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shpgerhe.cpp 25 Oct 2003 14:30:20 -0000 1.12
--- shpgerhe.cpp 15 Nov 2003 20:48:07 -0000 1.13
***************
*** 952,956 ****
{
STACKTRACE
! int totdamage = normal + direct;
state = 1; // just in case it's been changed by the planet !
--- 952,956 ----
{
STACKTRACE
! //int totdamage = normal + direct;
state = 1; // just in case it's been changed by the planet !
Index: shphotsp.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shphotsp.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shphotsp.cpp 8 Nov 2003 11:19:30 -0000 1.8
--- shphotsp.cpp 15 Nov 2003 20:48:07 -0000 1.9
***************
*** 147,151 ****
! Vector2 U = vel;
a = angle;
double prev_batt = batt;
--- 147,151 ----
! //Vector2 U = vel;
a = angle;
double prev_batt = batt;
Index: shpiceco.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpiceco.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpiceco.cpp 20 Oct 2003 11:00:39 -0000 1.7
--- shpiceco.cpp 15 Nov 2003 20:48:07 -0000 1.8
***************
*** 146,151 ****
if ( other->isShip() )
{
- Ship *t = (Ship*) other;
-
game->add(new Confusionator((Ship*)other, confusionLifeTime));
}
--- 146,149 ----
Index: shplyrwa.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shplyrwa.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shplyrwa.cpp 20 Oct 2003 11:00:44 -0000 1.7
--- shplyrwa.cpp 15 Nov 2003 20:48:07 -0000 1.8
***************
*** 146,151 ****
weaponObject->state = 0;
weaponObject->powerLevel = 0;
! }
! if(weaponObject->armour = normal) {
weaponObject->armour = 0;
weaponObject->damage_factor = 0;
--- 146,151 ----
weaponObject->state = 0;
weaponObject->powerLevel = 0;
! }else
! if(weaponObject->armour == normal) {
weaponObject->armour = 0;
weaponObject->damage_factor = 0;
***************
*** 153,157 ****
weaponObject->state = 0;
weaponObject->powerLevel = 0;
! }
if(weaponObject->armour > normal) {
weaponObject->armour -= normal;
--- 153,157 ----
weaponObject->state = 0;
weaponObject->powerLevel = 0;
! }else
if(weaponObject->armour > normal) {
weaponObject->armour -= normal;
|
|
From: <yu...@us...> - 2003-11-15 20:48:14
|
Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv2688/source/games
Modified Files:
gflmelee.cpp gmissions.cpp
Log Message:
Fixed not virtual destructor bugs.
Fixed uninitialized varriable use bugs.
Fixed calculation damage in one of the ships
Index: gflmelee.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gflmelee.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gflmelee.cpp 26 Oct 2003 14:36:17 -0000 1.10
--- gflmelee.cpp 15 Nov 2003 20:48:06 -0000 1.11
***************
*** 519,523 ****
playercontrols[1] = 0;
! Ship *takeovership;
for ( iplayer = 0; iplayer < 2; ++iplayer )
--- 519,523 ----
playercontrols[1] = 0;
! Ship *takeovership = NULL;
for ( iplayer = 0; iplayer < 2; ++iplayer )
***************
*** 614,619 ****
playercontrols[0]->set_target(-1);
!
!
oldcontrol = takeovership->control; // remember :)
playercontrols[0]->select_ship(takeovership, "none");
--- 614,621 ----
playercontrols[0]->set_target(-1);
!
! if( takeovership == NULL )
! tw_error("takeovership is used without initialization");
!
oldcontrol = takeovership->control; // remember :)
playercontrols[0]->select_ship(takeovership, "none");
Index: gmissions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gmissions.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gmissions.cpp 28 Oct 2003 00:00:39 -0000 1.10
--- gmissions.cpp 15 Nov 2003 20:48:06 -0000 1.11
***************
*** 1378,1382 ****
// check your position
! double Rs, Rt;
Rs = min_delta(shp->pos, loc, map_size).length();
--- 1378,1382 ----
// check your position
! double Rs, Rt = 0;
Rs = min_delta(shp->pos, loc, map_size).length();
***************
*** 1386,1390 ****
// just move around in (or return to) the guard area, if the enemy is out of reach
// (if the enemy stays in reach, you got a hot pursuit :)
! if (!enemy || Rt > Rattack)
{
// reset the keys for this ship
--- 1386,1390 ----
// just move around in (or return to) the guard area, if the enemy is out of reach
// (if the enemy stays in reach, you got a hot pursuit :)
! if (!(enemy && enemy->exists()) || Rt > Rattack)
{
// reset the keys for this ship
|
|
From: <yu...@us...> - 2003-11-15 20:48:10
|
Update of /cvsroot/timewarp/source/games/triggers
In directory sc8-pr-cvs1:/tmp/cvs-serv2688/source/games/triggers
Modified Files:
trcontrol.h trtest.cpp trtest.h
Log Message:
Fixed not virtual destructor bugs.
Fixed uninitialized varriable use bugs.
Fixed calculation damage in one of the ships
Index: trcontrol.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/triggers/trcontrol.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** trcontrol.h 26 Oct 2003 10:43:17 -0000 1.2
--- trcontrol.h 15 Nov 2003 20:48:07 -0000 1.3
***************
*** 12,15 ****
--- 12,16 ----
{
public:
+ virtual ~action_func_control(){};
// execution of blocks is handled by this:
action_func *current_action;
***************
*** 30,33 ****
--- 31,35 ----
{
public:
+ virtual ~action_startfunction(){};
action_func *main_ptr;
double timer, timeforaction;
***************
*** 55,58 ****
--- 57,61 ----
{
public:
+ virtual ~action_subr(){};
action_func *block_ptr;
***************
*** 74,77 ****
--- 77,81 ----
{
public:
+ virtual ~action_if(){};
action_func *true_block_ptr, *false_block_ptr;
int *ichoice;
***************
*** 92,95 ****
--- 96,100 ----
{
public:
+ virtual ~action_for(){};
action_func *block_ptr;
int *ivar, *istart, *iend;
***************
*** 113,117 ****
{
public:
!
action_func *level_ptr[max_action_levels];
--- 118,122 ----
{
public:
! virtual ~action_levels(){};
action_func *level_ptr[max_action_levels];
Index: trtest.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/triggers/trtest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** trtest.cpp 26 Oct 2003 10:43:17 -0000 1.2
--- trtest.cpp 15 Nov 2003 20:48:07 -0000 1.3
***************
*** 628,632 ****
void action_vars_str::set_id(char vartype, int i, char *id)
{
! char *trg;
switch (vartype)
--- 628,632 ----
void action_vars_str::set_id(char vartype, int i, char *id)
{
! char *trg = NULL;
switch (vartype)
***************
*** 641,644 ****
--- 641,647 ----
trg = strvarid[i];
break;
+ default:
+ ASSERT(0&&"trg is not valid");
+ break;
}
Index: trtest.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/triggers/trtest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** trtest.h 26 Oct 2003 10:43:17 -0000 1.2
--- trtest.h 15 Nov 2003 20:48:07 -0000 1.3
***************
*** 17,21 ****
action_func();
! ~action_func();
virtual void insert(action_func *a, action_func *b);
--- 17,21 ----
action_func();
! virtual ~action_func();
virtual void insert(action_func *a, action_func *b);
***************
*** 141,145 ****
ActionID();
! ~ActionID();
action_func *action[maxactions];
--- 141,145 ----
ActionID();
! virtual ~ActionID();
action_func *action[maxactions];
|
|
From: <yu...@us...> - 2003-11-15 20:48:10
|
Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv2688/source/melee
Modified Files:
mfleet.cpp moptions.cpp
Log Message:
Fixed not virtual destructor bugs.
Fixed uninitialized varriable use bugs.
Fixed calculation damage in one of the ships
Index: mfleet.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mfleet.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mfleet.cpp 12 Nov 2003 17:35:30 -0000 1.13
--- mfleet.cpp 15 Nov 2003 20:48:06 -0000 1.14
***************
*** 182,186 ****
return NULL;
! return ships.at(slot);
}
--- 182,186 ----
return NULL;
! return ships[slot];
}
Index: moptions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** moptions.cpp 15 Nov 2003 12:24:46 -0000 1.8
--- moptions.cpp 15 Nov 2003 20:48:06 -0000 1.9
***************
*** 204,208 ****
//set index for resolution
! int x, y, x2, y2, i, bpp, bpp2, fs;
x2 = videosystem.width;
y2 = videosystem.height;
--- 204,208 ----
//set index for resolution
! int x=-1, y=-1, x2, y2, i, bpp, bpp2, fs;
x2 = videosystem.width;
y2 = videosystem.height;
***************
*** 212,217 ****
if ((x == x2) && (y == y2)) break;
}
video_dialog[DIALOG_VIDEO_RESLIST].d1 = i;
-
//set index for bpp
bpp = videosystem.bpp;
--- 212,219 ----
if ((x == x2) && (y == y2)) break;
}
+ if(!resolution[0])
+ tw_error("Resolution error");
+
video_dialog[DIALOG_VIDEO_RESLIST].d1 = i;
//set index for bpp
bpp = videosystem.bpp;
|
|
From: <yu...@us...> - 2003-11-15 20:48:10
|
Update of /cvsroot/timewarp/source
In directory sc8-pr-cvs1:/tmp/cvs-serv2688/source
Modified Files:
gui.cpp
Log Message:
Fixed not virtual destructor bugs.
Fixed uninitialized varriable use bugs.
Fixed calculation damage in one of the ships
Index: gui.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gui.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gui.cpp 21 Oct 2003 02:02:34 -0000 1.8
--- gui.cpp 15 Nov 2003 20:48:06 -0000 1.9
***************
*** 289,293 ****
static char result[512];
enum { INI, CFG, DEV, NORMAL};
! int type;
strcpy(buffy, item);
if (*item == '/') {
--- 289,293 ----
static char result[512];
enum { INI, CFG, DEV, NORMAL};
! int type = -1;
strcpy(buffy, item);
if (*item == '/') {
***************
*** 304,307 ****
--- 304,308 ----
ce.subtype = ConfigEvent::GET;
+ ASSERT(type!=-1);
switch (type) {
case NORMAL: {
***************
*** 333,337 ****
char buffy2[256];
enum { INI, CFG, DEV, NORMAL};
! int type;
strcpy(buffy, item);
if (*item == '/') {
--- 334,338 ----
char buffy2[256];
enum { INI, CFG, DEV, NORMAL};
! int type = -1;
strcpy(buffy, item);
if (*item == '/') {
***************
*** 350,353 ****
--- 351,355 ----
ce.subtype = ConfigEvent::SET;
+ ASSERT(type!=-1);
switch (type) {
case NORMAL: {
|
|
From: <geo...@us...> - 2003-11-15 12:24:49
|
Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv17650/source/melee
Modified Files:
moptions.cpp
Log Message:
added 2 option buttons for the "camera hides cloakers" and the "3d planet"
Index: moptions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** moptions.cpp 12 Nov 2003 17:35:30 -0000 1.7
--- moptions.cpp 15 Nov 2003 12:24:46 -0000 1.8
***************
*** 414,417 ****
--- 414,419 ----
OPTIONS_DIALOG_RELATIVITY_SLIDER,
OPTIONS_DIALOG_FRIENDLY_FIRE,
+ OPTIONS_DIALOG_HIDE_CLOAKERS,
+ OPTIONS_DIALOG_3DPLANET,
//OPTIONS_DIALOG_TURBO_TEXT
//OPTIONS_DIALOG_TURBO_SLIDER
***************
*** 447,451 ****
{ d_text_proc, 40, 94, 160, 20, 255, 0, 0, 0, 0, 0, (void*)"Shot Relativity", NULL, NULL },
{ d_slider_proc, 212, 96, 160, 16, 255, 0, 0, 0, 1000,0, NULL, NULL, NULL },
! { d_check_proc, 60, 144, 184, 20, 255, 0, 0, 0, 1, 0, (void*)"Friendly Fire", NULL, NULL },
{ d_text_proc, 292, 244, 120, 20, 255, 0, 0, 0, 0, 0, (void *)"View", NULL, NULL },
{ d_list_proc, 284, 264, 180, 90, 255, 0, 0, 0, 0, 0, (void *) viewListboxGetter, NULL, NULL },
--- 449,455 ----
{ d_text_proc, 40, 94, 160, 20, 255, 0, 0, 0, 0, 0, (void*)"Shot Relativity", NULL, NULL },
{ d_slider_proc, 212, 96, 160, 16, 255, 0, 0, 0, 1000,0, NULL, NULL, NULL },
! { d_check_proc, 40, 144, 184, 20, 255, 0, 0, 0, 1, 0, (void*)"Friendly Fire", NULL, NULL }, //OPTIONS_DIALOG_FRIENDLY_FIRE,
! { d_check_proc, 40, 170, 100, 14, 255, 0, 0, 0, 1, 0, (void*)"Camera hides cloakers", NULL, NULL }, //OPTIONS_DIALOG_HIDE_CLOAKERS,
! { d_check_proc, 40, 190, 100, 14, 255, 0, 0, 0, 1, 0, (void*)"3D Planet", NULL, NULL }, //OPTIONS_DIALOG_3DPLANET,
{ d_text_proc, 292, 244, 120, 20, 255, 0, 0, 0, 0, 0, (void *)"View", NULL, NULL },
{ d_list_proc, 284, 264, 180, 90, 255, 0, 0, 0, 0, 0, (void *) viewListboxGetter, NULL, NULL },
***************
*** 494,499 ****
--- 498,513 ----
old_optionsDialog[OPTIONS_DIALOG_FRIENDLY_FIRE].flags = 0;
+ if (get_config_int("View", "CameraHidesCloakers", 1))
+ old_optionsDialog[OPTIONS_DIALOG_HIDE_CLOAKERS].flags = D_SELECTED;
+ else
+ old_optionsDialog[OPTIONS_DIALOG_HIDE_CLOAKERS].flags = 0;
set_config_file("client.ini");
+
+ if (get_config_int("Planet", "PlanetDimension", 2) == 3)
+ old_optionsDialog[OPTIONS_DIALOG_3DPLANET].flags = D_SELECTED;
+ else
+ old_optionsDialog[OPTIONS_DIALOG_3DPLANET].flags = 0;
+
i = get_view_num ( get_config_string ( "View", "View", NULL ) );
if (i == -1) i = 0;
***************
*** 523,526 ****
--- 537,546 ----
set_tw_aa_mode(aa);
+ if (old_optionsDialog[OPTIONS_DIALOG_3DPLANET].flags == D_SELECTED)
+ i = 3;
+ else
+ i = 2;
+ set_config_int("Planet", "PlanetDimension", i);
+
View *v = get_view(
view_name[old_optionsDialog[OPTIONS_DIALOG_VIEW].d1],
***************
*** 545,548 ****
--- 565,573 ----
else i = 0;
twconfig_set_int("/cfg/server.ini/game/friendlyfire", i);
+
+ if (old_optionsDialog[OPTIONS_DIALOG_HIDE_CLOAKERS].flags & D_SELECTED)
+ i = 1;
+ else i = 0;
+ twconfig_set_int("/cfg/server.ini/view/camerahidescloakers", i);
return;
|
|
From: <geo...@us...> - 2003-11-15 11:04:23
|
Update of /cvsroot/timewarp/ships In directory sc8-pr-cvs1:/tmp/cvs-serv5883/ships Modified Files: shpalabc.ini shpbubbo.ini shpcresu.ini shpearc3.ini shpplane.ini shpraame.ini shprekas.ini shpsamat.ini shpstaba.ini shpvenke.ini shpxxxas.ini shpyevme.ini Log Message: added new "special" ship class for filtering (plus extra checkbox Index: shpalabc.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpalabc.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpalabc.ini 2 Nov 2003 12:11:53 -0000 1.4 --- shpalabc.ini 15 Nov 2003 11:04:18 -0000 1.5 *************** *** 3,7 **** Name1 = Alary Name2 = BattleCruiser ! Origin = TW Coders = Tau code = AlaryBC --- 3,7 ---- Name1 = Alary Name2 = BattleCruiser ! Origin = TWs Coders = Tau code = AlaryBC Index: shpbubbo.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpbubbo.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpbubbo.ini 30 Aug 2003 09:23:08 -0000 1.4 --- shpbubbo.ini 15 Nov 2003 11:04:18 -0000 1.5 *************** *** 3,7 **** Name1 = Bubalos Name2 = Bomber ! Origin = TW Coders = Tamaraw ; updated by Varith, GeomanNL Gfx = Tau --- 3,7 ---- Name1 = Bubalos Name2 = Bomber ! Origin = TWb Coders = Tamaraw ; updated by Varith, GeomanNL Gfx = Tau Index: shpcresu.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpcresu.ini,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shpcresu.ini 26 Oct 2003 10:43:16 -0000 1.2 --- shpcresu.ini 15 Nov 2003 11:04:18 -0000 1.3 *************** *** 3,7 **** Name1 = Crew Name2 = Supplyship ! Origin = TW Gfx = GeomanNL Sfx = none --- 3,7 ---- Name1 = Crew Name2 = Supplyship ! Origin = TWs Gfx = GeomanNL Sfx = none Index: shpearc3.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpearc3.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shpearc3.ini 8 Jun 2003 17:54:58 -0000 1.3 --- shpearc3.ini 15 Nov 2003 11:04:18 -0000 1.4 *************** *** 3,7 **** Name1 = Earthling Name2 = Cruiser Mk III ! Origin = TW Coders = Tau Code = EarthlingCruiserMk3 --- 3,7 ---- Name1 = Earthling Name2 = Cruiser Mk III ! Origin = TWb Coders = Tau Code = EarthlingCruiserMk3 Index: shpplane.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpplane.ini,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shpplane.ini 26 Oct 2003 10:43:17 -0000 1.7 --- shpplane.ini 15 Nov 2003 11:04:18 -0000 1.8 *************** *** 2,6 **** TWCost = 60 Name = Gaia ! Origin = TW Coders = CyHawk, tweak=GeomanNL Code = PlanetShip --- 2,6 ---- TWCost = 60 Name = Gaia ! Origin = TWb Coders = CyHawk, tweak=GeomanNL Code = PlanetShip Index: shpraame.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpraame.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpraame.ini 29 Aug 2003 23:23:34 -0000 1.4 --- shpraame.ini 15 Nov 2003 11:04:18 -0000 1.5 *************** *** 4,8 **** Name1 = Raalrith Name2 = Menacer ! Origin = TW Coders = Slag-786B Code = RaalrithMenacer --- 4,8 ---- Name1 = Raalrith Name2 = Menacer ! Origin = TWb Coders = Slag-786B Code = RaalrithMenacer Index: shprekas.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shprekas.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shprekas.ini 8 Jun 2003 17:55:17 -0000 1.3 --- shprekas.ini 15 Nov 2003 11:04:18 -0000 1.4 *************** *** 3,7 **** Name1 = Re-Koj Name2 = Assassin ! Origin = TW Coders = Tamaraw Code = RekojAssassin --- 3,7 ---- Name1 = Re-Koj Name2 = Assassin ! Origin = TWb Coders = Tamaraw Code = RekojAssassin Index: shpsamat.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpsamat.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpsamat.ini 26 Oct 2003 10:43:17 -0000 1.4 --- shpsamat.ini 15 Nov 2003 11:04:18 -0000 1.5 *************** *** 3,7 **** Name1 = Sa-Matra Name2 = Battle Platform ! Origin = SC2 Gfx = SC2 Sfx = none --- 3,7 ---- Name1 = Sa-Matra Name2 = Battle Platform ! Origin = TWs Gfx = SC2 Sfx = none Index: shpstaba.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpstaba.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shpstaba.ini 8 Jun 2003 17:55:18 -0000 1.3 --- shpstaba.ini 15 Nov 2003 11:04:18 -0000 1.4 *************** *** 3,7 **** Name1 = Starbase Name2 = ! Origin = TW Coders = UAF :) sort off, thanks to the creators of the other ships I ; = used their code for this ship :) --- 3,7 ---- Name1 = Starbase Name2 = ! Origin = TWs Coders = UAF :) sort off, thanks to the creators of the other ships I ; = used their code for this ship :) Index: shpvenke.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpvenke.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shpvenke.ini 8 Jun 2003 17:55:29 -0000 1.3 --- shpvenke.ini 15 Nov 2003 11:04:18 -0000 1.4 *************** *** 5,9 **** Name1 = Ven-Kek Name2 = Vectora ! Origin = TW Coders = Varith Code = VenKekFrigate --- 5,9 ---- Name1 = Ven-Kek Name2 = Vectora ! Origin = TWb Coders = Varith Code = VenKekFrigate Index: shpxxxas.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpxxxas.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shpxxxas.ini 8 Jun 2003 17:55:30 -0000 1.3 --- shpxxxas.ini 15 Nov 2003 11:04:18 -0000 1.4 *************** *** 3,7 **** Name1 = Space Monster Name2 = Assimilator ! Origin = TW Coders = Tamaraw Code = XXXAssimilator --- 3,7 ---- Name1 = Space Monster Name2 = Assimilator ! Origin = TWb Coders = Tamaraw Code = XXXAssimilator Index: shpyevme.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpyevme.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shpyevme.ini 8 Jun 2003 17:55:30 -0000 1.3 --- shpyevme.ini 15 Nov 2003 11:04:18 -0000 1.4 *************** *** 4,8 **** Name1 = Yev Name2 = Mech ! Origin = TW Coders = Tamaraw Original = Idea = Jumping Peppers --- 4,8 ---- Name1 = Yev Name2 = Mech ! Origin = TWb Coders = Tamaraw Original = Idea = Jumping Peppers |
|
From: <geo...@us...> - 2003-11-15 11:04:21
|
Update of /cvsroot/timewarp/source
In directory sc8-pr-cvs1:/tmp/cvs-serv5883/source
Modified Files:
scp.cpp
Log Message:
added new "special" ship class for filtering (plus extra checkbox
Index: scp.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/scp.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** scp.cpp 13 Nov 2003 01:03:07 -0000 1.23
--- scp.cpp 15 Nov 2003 11:04:17 -0000 1.24
***************
*** 1113,1116 ****
--- 1113,1117 ----
FLEET_DIALOG_TW_OFFICIAL_TOGGLE,
FLEET_DIALOG_TW_EXP_TOGGLE,
+ FLEET_DIALOG_TW_SPECIAL_TOGGLE,
FLEET_DIALOG_SORTBY_TEXT1,
FLEET_DIALOG_SORTBY_BUTTON1,
***************
*** 1195,1208 ****
{ d_textbox_proc, 10, 35, 128, 17, 255, 0, 0, 0, 0, 0, (void *)"Ship Catagories:", NULL, NULL },//FLEET_DIALOG_SHIP_CATAGORIES_TEXT
! { d_check_proc_fleeteditor,
! 30, 52, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC1", NULL, NULL },//FLEET_DIALOG_SC1_TOGGLE
{ d_check_proc_fleeteditor,
! 30, 66, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC2", NULL, NULL },//FLEET_DIALOG_SC2_TOGGLE
{ d_check_proc_fleeteditor,
! 30, 79, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC3", NULL, NULL },//FLEET_DIALOG_SC3_TOGGLE
{ d_check_proc_fleeteditor,
! 30, 93, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"TW (Official)", NULL, NULL },//FLEET_DIALOG_TW_OFFICIAL_TOGGLE
{ d_check_proc_fleeteditor,
! 30, 107, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Experimental)", NULL, NULL },//FLEET_DIALOG_TW_EXP_TOGGLE
{ d_textbox_proc, 10, 121, 64, 17, 255, 0, 0, 0, 0, 0, (void *)"Sort By:", NULL, NULL },//FLEET_DIALOG_SORTBY_TEXT1
--- 1196,1214 ----
{ d_textbox_proc, 10, 35, 128, 17, 255, 0, 0, 0, 0, 0, (void *)"Ship Catagories:", NULL, NULL },//FLEET_DIALOG_SHIP_CATAGORIES_TEXT
! { d_check_proc_fleeteditor, // x=30-->x=10
! 10, 52, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC1", NULL, NULL },//FLEET_DIALOG_SC1_TOGGLE
{ d_check_proc_fleeteditor,
! 10, 66, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC2", NULL, NULL },//FLEET_DIALOG_SC2_TOGGLE
{ d_check_proc_fleeteditor,
! 10, 79, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC3", NULL, NULL },//FLEET_DIALOG_SC3_TOGGLE
{ d_check_proc_fleeteditor,
! // 30, 93, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"TW (Official)", NULL, NULL },//FLEET_DIALOG_TW_OFFICIAL_TOGGLE
! 80, 52, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"TW (Official)", NULL, NULL },//FLEET_DIALOG_TW_OFFICIAL_TOGGLE
{ d_check_proc_fleeteditor,
! // 30, 107, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Experimental)", NULL, NULL },//FLEET_DIALOG_TW_EXP_TOGGLE
! 80, 66, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Experimental)", NULL, NULL },//FLEET_DIALOG_TW_EXP_TOGGLE
! { d_check_proc_fleeteditor,
! // 30, 107, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Special)", NULL, NULL },//FLEET_DIALOG_TW_SPECIAL_TOGGLE
! 80, 79, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Special)", NULL, NULL },//FLEET_DIALOG_TW_SPECIAL_TOGGLE
{ d_textbox_proc, 10, 121, 64, 17, 255, 0, 0, 0, 0, 0, (void *)"Sort By:", NULL, NULL },//FLEET_DIALOG_SORTBY_TEXT1
***************
*** 1335,1338 ****
--- 1341,1349 ----
reference_fleet->addShipType(&shiptypes[c]);
break;
+
+ case SHIP_ORIGIN_TW_SPECIAL:
+ if (fleetDialog[FLEET_DIALOG_TW_SPECIAL_TOGGLE].flags & D_SELECTED)
+ reference_fleet->addShipType(&shiptypes[c]);
+ break;
}
}
***************
*** 1352,1355 ****
--- 1363,1367 ----
case FLEET_DIALOG_TW_OFFICIAL_TOGGLE:
case FLEET_DIALOG_TW_EXP_TOGGLE:
+ case FLEET_DIALOG_TW_SPECIAL_TOGGLE:
availableFleetDirty = true;
break;
|
|
From: <geo...@us...> - 2003-11-15 11:04:21
|
Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv5883/source/melee
Modified Files:
mship.cpp mship.h
Log Message:
added new "special" ship class for filtering (plus extra checkbox
Index: mship.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mship.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** mship.cpp 13 Nov 2003 19:08:47 -0000 1.17
--- mship.cpp 15 Nov 2003 11:04:17 -0000 1.18
***************
*** 144,147 ****
--- 144,149 ----
if (strcmp(origname, "TWB") == 0) // beta ships
ori = SHIP_ORIGIN_TW_BETA;
+ if (strcmp(origname, "TWS") == 0) // special ships
+ ori = SHIP_ORIGIN_TW_SPECIAL;
Index: mship.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mship.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mship.h 12 Nov 2003 22:55:08 -0000 1.9
--- mship.h 15 Nov 2003 11:04:17 -0000 1.10
***************
*** 65,69 ****
SHIP_ORIGIN_SC3,/**< from Star Control 3*/
SHIP_ORIGIN_TW_ALPHA,/**< Timewarp "Alpha"*/
! SHIP_ORIGIN_TW_BETA/**< Timewarp "Beta"*/
};
--- 65,70 ----
SHIP_ORIGIN_SC3,/**< from Star Control 3*/
SHIP_ORIGIN_TW_ALPHA,/**< Timewarp "Alpha"*/
! SHIP_ORIGIN_TW_BETA,/**< Timewarp "Beta"*/
! SHIP_ORIGIN_TW_SPECIAL/**< Timewarp "Special"*/
};
|
|
From: <yu...@us...> - 2003-11-15 01:37:45
|
Update of /cvsroot/timewarp/include/allegro/internal
In directory sc8-pr-cvs1:/tmp/cvs-serv31203/include/allegro/internal
Modified Files:
aintern.h alconfig.h
Log Message:
Fixed Allegro migration to 4.0.3 bug
Index: aintern.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/internal/aintern.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aintern.h 8 Jun 2003 19:24:56 -0000 1.3
--- aintern.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 311,319 ****
/* console switching support */
AL_FUNC(void, _register_switch_bitmap, (BITMAP *bmp, BITMAP *parent));
AL_FUNC(void, _unregister_switch_bitmap, (BITMAP *bmp));
AL_FUNC(void, _save_switch_state, (int switch_mode));
! AL_FUNC(void, _restore_switch_state, ());
AL_VAR(int, _dispsw_status);
--- 311,335 ----
+ /* default truecolor pixel format */
+ #define DEFAULT_RGB_R_SHIFT_15 0
+ #define DEFAULT_RGB_G_SHIFT_15 5
+ #define DEFAULT_RGB_B_SHIFT_15 10
+ #define DEFAULT_RGB_R_SHIFT_16 0
+ #define DEFAULT_RGB_G_SHIFT_16 5
+ #define DEFAULT_RGB_B_SHIFT_16 11
+ #define DEFAULT_RGB_R_SHIFT_24 0
+ #define DEFAULT_RGB_G_SHIFT_24 8
+ #define DEFAULT_RGB_B_SHIFT_24 16
+ #define DEFAULT_RGB_R_SHIFT_32 0
+ #define DEFAULT_RGB_G_SHIFT_32 8
+ #define DEFAULT_RGB_B_SHIFT_32 16
+ #define DEFAULT_RGB_A_SHIFT_32 24
+
+
/* console switching support */
AL_FUNC(void, _register_switch_bitmap, (BITMAP *bmp, BITMAP *parent));
AL_FUNC(void, _unregister_switch_bitmap, (BITMAP *bmp));
AL_FUNC(void, _save_switch_state, (int switch_mode));
! AL_FUNC(void, _restore_switch_state, (void));
AL_VAR(int, _dispsw_status);
***************
*** 1088,1092 ****
int type;
AL_METHOD(void *, load, (PACKFILE *f, long size));
! AL_METHOD(void, destroy, ());
} DATAFILE_TYPE;
--- 1104,1108 ----
int type;
AL_METHOD(void *, load, (PACKFILE *f, long size));
! AL_METHOD(void, destroy, (void *));
} DATAFILE_TYPE;
***************
*** 1125,1129 ****
/* dynamic driver lists */
! AL_FUNC(_DRIVER_INFO *, _create_driver_list, ());
AL_FUNC(void, _destroy_driver_list, (_DRIVER_INFO *drvlist));
AL_FUNC(void, _driver_list_append_driver, (_DRIVER_INFO **drvlist, int id, void *driver, int autodetect));
--- 1141,1145 ----
/* dynamic driver lists */
! AL_FUNC(_DRIVER_INFO *, _create_driver_list, (void));
AL_FUNC(void, _destroy_driver_list, (_DRIVER_INFO *drvlist));
AL_FUNC(void, _driver_list_append_driver, (_DRIVER_INFO **drvlist, int id, void *driver, int autodetect));
Index: alconfig.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/internal/alconfig.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alconfig.h 8 Jun 2003 19:24:57 -0000 1.3
--- alconfig.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 62,66 ****
#define AL_INLINE(type, name, args, code) static inline type name args code
#else
! #define AL_INLINE(type, name, args, code) extern inline type name args code
#endif
#endif
--- 62,66 ----
#define AL_INLINE(type, name, args, code) static inline type name args code
#else
! #define AL_INLINE(type, name, args, code) extern __inline__ type name args code
#endif
#endif
***************
*** 69,73 ****
#ifndef INLINE
! #define INLINE inline
#endif
--- 69,73 ----
#ifndef INLINE
! #define INLINE __inline__
#endif
***************
*** 83,91 ****
#endif
! #ifndef ZERO_SIZE
#if __GNUC__ < 3
! #define ZERO_SIZE 0
#else
! #define ZERO_SIZE
#endif
#endif
--- 83,91 ----
#endif
! #ifndef ZERO_SIZE_ARRAY
#if __GNUC__ < 3
! #define ZERO_SIZE_ARRAY(type, name) __extension__ type name[0]
#else
! #define ZERO_SIZE_ARRAY(type, name) type name[] /* ISO C99 flexible array members */
#endif
#endif
***************
*** 113,125 ****
-
- /* if we are using gcc, then constructors are supported */
- #ifdef __GNUC__
- #undef CONSTRUCTOR_FUNCTION
- #undef DESTRUCTOR_FUNCTION
- #define CONSTRUCTOR_FUNCTION(func) func __attribute__ ((constructor))
- #define DESTRUCTOR_FUNCTION(func) func __attribute__ ((destructor))
- #endif
-
/* the rest of this file fills in some default definitions of language
* features and helper functions, which are conditionalised so they will
--- 113,116 ----
***************
*** 135,140 ****
#endif
! #ifndef ZERO_SIZE
! #define ZERO_SIZE
#endif
--- 126,131 ----
#endif
! #ifndef ZERO_SIZE_ARRAY
! #define ZERO_SIZE_ARRAY(type, name) type name[]
#endif
***************
*** 253,256 ****
--- 244,273 ----
+ /* endian-independent 3-byte accessor macros */
+ #ifdef ALLEGRO_LITTLE_ENDIAN
+
+ #define READ3BYTES(p) (((int) *(p)) \
+ | ((int) *((p) + 1) << 8) \
+ | ((int) *((p) + 2) << 16))
+
+ #define WRITE3BYTES(p,c) ((*(p) = (c)), \
+ (*((p) + 1) = (c) >> 8), \
+ (*((p) + 2) = (c) >> 16))
+
+ #elif defined ALLEGRO_BIG_ENDIAN
+
+ #define READ3BYTES(p) (((int) *(p) << 16) \
+ | ((int) *((p) + 1) << 8) \
+ | ((int) *((p) + 2)))
+
+ #define WRITE3BYTES(p,c) ((*(p) = (c) >> 16), \
+ (*((p) + 1) = (c) >> 8), \
+ (*((p) + 2) = (c)))
+
+ #else
+ #error endianess not defined
+ #endif
+
+
/* generic versions of the video memory access helpers */
#ifndef bmp_select
***************
*** 269,283 ****
#define bmp_read32(addr) (*((unsigned long *)(addr)))
- #ifdef ALLEGRO_LITTLE_ENDIAN
-
- AL_INLINE(void, bmp_write24, (unsigned long addr, int c),
- {
- unsigned char *p = (unsigned char *)addr;
-
- p[0] = c & 0xFF;
- p[1] = (c>>8) & 0xFF;
- p[2] = (c>>16) & 0xFF;
- })
-
AL_INLINE(int, bmp_read24, (unsigned long addr),
{
--- 286,289 ----
***************
*** 285,321 ****
int c;
! c = p[0];
! c |= (int)p[1] << 8;
! c |= (int)p[2] << 16;
return c;
})
- #elif defined ALLEGRO_BIG_ENDIAN
-
AL_INLINE(void, bmp_write24, (unsigned long addr, int c),
{
unsigned char *p = (unsigned char *)addr;
! p[0] = (c>>16) & 0xFF;
! p[1] = (c>>8) & 0xFF;
! p[2] = c & 0xFF;
! })
!
! AL_INLINE(int, bmp_read24, (unsigned long addr),
! {
! unsigned char *p = (unsigned char *)addr;
! int c;
!
! c = (int)p[0] << 16;
! c |= (int)p[1] << 8;
! c |= p[2];
!
! return c;
})
-
- #else
- #error endianess not defined
- #endif
#endif
--- 291,305 ----
int c;
! c = READ3BYTES(p);
return c;
})
AL_INLINE(void, bmp_write24, (unsigned long addr, int c),
{
unsigned char *p = (unsigned char *)addr;
! WRITE3BYTES(p, c);
})
#endif
|
|
From: <yu...@us...> - 2003-11-15 01:37:45
|
Update of /cvsroot/timewarp/include/allegro
In directory sc8-pr-cvs1:/tmp/cvs-serv31203/include/allegro
Modified Files:
alcompat.h base.h datafile.h fix.h gfx.h rle.h system.h text.h
Log Message:
Fixed Allegro migration to 4.0.3 bug
Index: alcompat.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/alcompat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alcompat.h 8 Jun 2003 19:24:56 -0000 1.3
--- alcompat.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 27,31 ****
#ifndef ALLEGRO_NO_CLEAR_BITMAP_ALIAS
#if (defined ALLEGRO_GCC)
! static __attribute__((unused)) inline void clear(BITMAP *bmp)
{
clear_bitmap(bmp);
--- 27,31 ----
#ifndef ALLEGRO_NO_CLEAR_BITMAP_ALIAS
#if (defined ALLEGRO_GCC)
! static __attribute__((unused)) __inline__ void clear(BITMAP *bmp)
{
clear_bitmap(bmp);
***************
*** 42,46 ****
#if (defined ALLEGRO_GCC)
#define AL_ALIAS(DECL, CALL) \
! static __attribute__((unused)) inline DECL \
{ \
return CALL; \
--- 42,46 ----
#if (defined ALLEGRO_GCC)
#define AL_ALIAS(DECL, CALL) \
! static __attribute__((unused)) __inline__ DECL \
{ \
return CALL; \
***************
*** 53,71 ****
}
#endif
! AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y));
! AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y));
! AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y));
! AL_ALIAS(fixed fdiv(fixed x, fixed y), fixdiv(x, y));
! AL_ALIAS(int fceil(fixed x), fixceil(x));
! AL_ALIAS(int ffloor(fixed x), fixfloor(x));
! AL_ALIAS(fixed fcos(fixed x), fixcos(x));
! AL_ALIAS(fixed fsin(fixed x), fixsin(x));
! AL_ALIAS(fixed ftan(fixed x), fixtan(x));
! AL_ALIAS(fixed facos(fixed x), fixacos(x));
! AL_ALIAS(fixed fasin(fixed x), fixasin(x));
! AL_ALIAS(fixed fatan(fixed x), fixatan(x));
! AL_ALIAS(fixed fatan2(fixed y, fixed x), fixatan2(y, x));
! AL_ALIAS(fixed fsqrt(fixed x), fixsqrt(x));
! AL_ALIAS(fixed fhypot(fixed x, fixed y), fixhypot(x, y));
#undef AL_ALIAS
#endif
--- 53,71 ----
}
#endif
! AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y))
! AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y))
! AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y))
! AL_ALIAS(fixed fdiv(fixed x, fixed y), fixdiv(x, y))
! AL_ALIAS(int fceil(fixed x), fixceil(x))
! AL_ALIAS(int ffloor(fixed x), fixfloor(x))
! AL_ALIAS(fixed fcos(fixed x), fixcos(x))
! AL_ALIAS(fixed fsin(fixed x), fixsin(x))
! AL_ALIAS(fixed ftan(fixed x), fixtan(x))
! AL_ALIAS(fixed facos(fixed x), fixacos(x))
! AL_ALIAS(fixed fasin(fixed x), fixasin(x))
! AL_ALIAS(fixed fatan(fixed x), fixatan(x))
! AL_ALIAS(fixed fatan2(fixed y, fixed x), fixatan2(y, x))
! AL_ALIAS(fixed fsqrt(fixed x), fixsqrt(x))
! AL_ALIAS(fixed fhypot(fixed x, fixed y), fixhypot(x, y))
#undef AL_ALIAS
#endif
Index: base.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/base.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** base.h 8 Jun 2003 19:24:56 -0000 1.3
--- base.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 38,45 ****
#define ALLEGRO_VERSION 4
#define ALLEGRO_SUB_VERSION 0
! #define ALLEGRO_WIP_VERSION 2
! #define ALLEGRO_VERSION_STR "4.0.2"
! #define ALLEGRO_DATE_STR "2002"
! #define ALLEGRO_DATE 20020703 /* yyyymmdd */
/*******************************************/
--- 38,45 ----
#define ALLEGRO_VERSION 4
#define ALLEGRO_SUB_VERSION 0
! #define ALLEGRO_WIP_VERSION 3
! #define ALLEGRO_VERSION_STR "4.0.3"
! #define ALLEGRO_DATE_STR "2003"
! #define ALLEGRO_DATE 20030419 /* yyyymmdd */
/*******************************************/
Index: datafile.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/datafile.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** datafile.h 8 Jun 2003 19:24:56 -0000 1.3
--- datafile.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 75,79 ****
AL_FUNC(DATAFILE *, find_datafile_object, (AL_CONST DATAFILE *dat, AL_CONST char *objectname));
AL_FUNC(AL_CONST char *, get_datafile_property, (AL_CONST DATAFILE *dat, int type));
! AL_FUNC(void, register_datafile_object, (int id, AL_METHOD(void *, load, (struct PACKFILE *f, long size)), AL_METHOD(void, destroy, (void *data))));
AL_FUNC(void, fixup_datafile, (DATAFILE *data));
--- 75,79 ----
AL_FUNC(DATAFILE *, find_datafile_object, (AL_CONST DATAFILE *dat, AL_CONST char *objectname));
AL_FUNC(AL_CONST char *, get_datafile_property, (AL_CONST DATAFILE *dat, int type));
! AL_FUNC(void, register_datafile_object, (int id_, AL_METHOD(void *, load, (struct PACKFILE *f, long size)), AL_METHOD(void, destroy, (void *data))));
AL_FUNC(void, fixup_datafile, (DATAFILE *data));
Index: fix.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/fix.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fix.h 8 Jun 2003 19:24:56 -0000 1.3
--- fix.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 30,41 ****
fixed v;
! fix() { }
! fix(const fix &x) { v = x.v; }
! fix(const int x) { v = itofix(x); }
! fix(const long x) { v = itofix(x); }
! fix(const unsigned int x) { v = itofix(x); }
! fix(const unsigned long x) { v = itofix(x); }
! fix(const float x) { v = ftofix(x); }
! fix(const double x) { v = ftofix(x); }
operator int() const { return fixtoi(v); }
--- 30,41 ----
fixed v;
! fix() : v(0) { }
! fix(const fix &x) : v(x.v) { }
! fix(const int x) : v(itofix(x)) { }
! fix(const long x) : v(itofix(x)) { }
! fix(const unsigned int x) : v(itofix(x)) { }
! fix(const unsigned long x) : v(itofix(x)) { }
! fix(const float x) : v(ftofix(x)) { }
! fix(const double x) : v(ftofix(x)) { }
operator int() const { return fixtoi(v); }
Index: gfx.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/gfx.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gfx.h 8 Jun 2003 19:24:56 -0000 1.3
--- gfx.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 231,235 ****
int y_ofs; /* vertical offset (for sub-bitmaps) */
int seg; /* bitmap segment */
! unsigned char *line[ZERO_SIZE];
} BITMAP;
--- 231,235 ----
int y_ofs; /* vertical offset (for sub-bitmaps) */
int seg; /* bitmap segment */
! ZERO_SIZE_ARRAY(unsigned char *, line);
} BITMAP;
Index: rle.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/rle.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rle.h 8 Jun 2003 19:24:56 -0000 1.3
--- rle.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 32,36 ****
int color_depth; /* color depth of the image */
int size; /* size of sprite data in bytes */
! signed char dat[ZERO_SIZE];
} RLE_SPRITE;
--- 32,36 ----
int color_depth; /* color depth of the image */
int size; /* size of sprite data in bytes */
! ZERO_SIZE_ARRAY(signed char, dat);
} RLE_SPRITE;
Index: system.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/system.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** system.h 8 Jun 2003 19:24:56 -0000 1.3
--- system.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 48,55 ****
#define OSTYPE_OPENDOS AL_ID('O','D','O','S')
#define OSTYPE_LINUX AL_ID('T','U','X',' ')
#define OSTYPE_FREEBSD AL_ID('F','B','S','D')
#define OSTYPE_UNIX AL_ID('U','N','I','X')
#define OSTYPE_BEOS AL_ID('B','E','O','S')
- #define OSTYPE_QNX AL_ID('Q','N','X',' ')
#define OSTYPE_MACOS AL_ID('M','A','C',' ')
--- 48,58 ----
#define OSTYPE_OPENDOS AL_ID('O','D','O','S')
#define OSTYPE_LINUX AL_ID('T','U','X',' ')
+ #define OSTYPE_SUNOS AL_ID('S','U','N',' ')
#define OSTYPE_FREEBSD AL_ID('F','B','S','D')
+ #define OSTYPE_NETBSD AL_ID('N','B','S','D')
+ #define OSTYPE_IRIX AL_ID('I','R','I','X')
+ #define OSTYPE_QNX AL_ID('Q','N','X',' ')
#define OSTYPE_UNIX AL_ID('U','N','I','X')
#define OSTYPE_BEOS AL_ID('B','E','O','S')
#define OSTYPE_MACOS AL_ID('M','A','C',' ')
Index: text.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/text.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** text.h 8 Jun 2003 19:24:56 -0000 1.3
--- text.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 31,35 ****
{
short w, h;
! unsigned char dat[ZERO_SIZE];
} FONT_GLYPH;
--- 31,35 ----
{
short w, h;
! ZERO_SIZE_ARRAY(unsigned char, dat);
} FONT_GLYPH;
|
|
From: <yu...@us...> - 2003-11-15 01:37:45
|
Update of /cvsroot/timewarp/include/allegro/platform
In directory sc8-pr-cvs1:/tmp/cvs-serv31203/include/allegro/platform
Modified Files:
aintbeos.h aintunix.h aintwin.h al386gcc.h albecfg.h aldjgpp.h
almaccfg.h almngw32.h almsvc.h alplatf.h alqnx.h alqnxcfg.h
alunix.h alunixac.hin alwatcom.h alwin.h
Log Message:
Fixed Allegro migration to 4.0.3 bug
Index: aintbeos.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/aintbeos.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aintbeos.h 8 Jun 2003 19:24:57 -0000 1.3
--- aintbeos.h 15 Nov 2003 01:37:37 -0000 1.4
***************
*** 117,121 ****
void *be_sound_lock_voice(int voice, int start, int end);
void be_sound_unlock_voice(int voice);
! int be_sound_buffer_size();
int be_sound_mixer_volume(int volume);
void be_sound_suspend(void);
--- 117,121 ----
void *be_sound_lock_voice(int voice, int start, int end);
void be_sound_unlock_voice(int voice);
! int be_sound_buffer_size(void);
int be_sound_mixer_volume(int volume);
void be_sound_suspend(void);
Index: aintunix.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/aintunix.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aintunix.h 8 Jun 2003 19:24:57 -0000 1.3
--- aintunix.h 15 Nov 2003 01:37:37 -0000 1.4
***************
*** 59,64 ****
AL_VAR(_DRIVER_INFO *, _unix_digi_driver_list);
AL_VAR(_DRIVER_INFO *, _unix_midi_driver_list);
! AL_FUNC(void, _unix_driver_lists_init, ());
! AL_FUNC(void, _unix_driver_lists_shutdown, ());
AL_FUNC(void, _unix_register_gfx_driver, (int id, GFX_DRIVER *driver, int autodetect, int priority));
AL_FUNC(void, _unix_register_digi_driver, (int id, DIGI_DRIVER *driver, int autodetect, int priority));
--- 59,64 ----
AL_VAR(_DRIVER_INFO *, _unix_digi_driver_list);
AL_VAR(_DRIVER_INFO *, _unix_midi_driver_list);
! AL_FUNC(void, _unix_driver_lists_init, (void));
! AL_FUNC(void, _unix_driver_lists_shutdown, (void));
AL_FUNC(void, _unix_register_gfx_driver, (int id, GFX_DRIVER *driver, int autodetect, int priority));
AL_FUNC(void, _unix_register_digi_driver, (int id, DIGI_DRIVER *driver, int autodetect, int priority));
Index: aintwin.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/aintwin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aintwin.h 8 Jun 2003 19:24:57 -0000 1.3
--- aintwin.h 15 Nov 2003 01:37:37 -0000 1.4
***************
*** 67,71 ****
--- 67,73 ----
AL_FUNC(int, get_dx_ver, (void));
AL_FUNC(void, set_sync_timer_freq, (int freq));
+ AL_FUNC(int, adjust_window, (int w, int h));
AL_FUNC(void, restore_window_style, (void));
+ AL_FUNC(void, save_window_pos, (void));
***************
*** 110,114 ****
AL_FUNC(void, sys_switch_out, (void));
! AL_FUNC(void, thread_switch_out, (void));
AL_FUNC(void, midi_switch_out, (void));
--- 112,116 ----
AL_FUNC(void, sys_switch_out, (void));
! AL_FUNC(int, thread_switch_out, (void));
AL_FUNC(void, midi_switch_out, (void));
***************
*** 121,124 ****
--- 123,127 ----
/************** keyboard routines **********/
/*******************************************/
+ AL_VAR(HANDLE, key_thread);
AL_FUNC(int, key_dinput_acquire, (void));
AL_FUNC(int, key_dinput_unacquire, (void));
***************
*** 131,134 ****
--- 134,138 ----
/************** mouse routines *************/
/*******************************************/
+ AL_VAR(HANDLE, mouse_thread);
AL_FUNC(int, mouse_dinput_acquire, (void));
AL_FUNC(int, mouse_dinput_unacquire, (void));
***************
*** 179,183 ****
AL_FUNC(void, thread_safe_trace, (char *msg, ...));
! #ifdef DEBUGMODE
#define _TRACE thread_safe_trace
#else
--- 183,187 ----
AL_FUNC(void, thread_safe_trace, (char *msg, ...));
! #if DEBUGMODE >= 2
#define _TRACE thread_safe_trace
#else
Index: al386gcc.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/al386gcc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** al386gcc.h 8 Jun 2003 19:24:57 -0000 1.3
--- al386gcc.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 30,34 ****
short result;
! asm (
" movw %%ds, %0 "
--- 30,34 ----
short result;
! __asm__ (
" movw %%ds, %0 "
***************
*** 48,52 ****
unsigned long result;
! asm volatile (
" call *%3 "
--- 48,52 ----
unsigned long result;
! __asm__ volatile (
" call *%3 "
***************
*** 70,74 ****
unsigned long result;
! asm volatile (
" call *%3 "
--- 70,74 ----
unsigned long result;
! __asm__ volatile (
" call *%3 "
***************
*** 90,94 ****
AL_INLINE(void, bmp_unwrite_line, (BITMAP *bmp),
{
! asm volatile (
" call *%1 "
:
--- 90,94 ----
AL_INLINE(void, bmp_unwrite_line, (BITMAP *bmp),
{
! __asm__ volatile (
" call *%1 "
:
***************
*** 137,141 ****
__PRECALCULATE_CONSTANTS(x + (double)y)
{
! asm (
" addl %2, %0 ; " /* do the addition */
" jno 0f ; " /* check for overflow */
--- 137,141 ----
__PRECALCULATE_CONSTANTS(x + (double)y)
{
! __asm__ (
" addl %2, %0 ; " /* do the addition */
" jno 0f ; " /* check for overflow */
***************
*** 175,179 ****
__PRECALCULATE_CONSTANTS(x - (double)y)
{
! asm (
" subl %2, %0 ; " /* do the subtraction */
" jno 0f ; " /* check for overflow */
--- 175,179 ----
__PRECALCULATE_CONSTANTS(x - (double)y)
{
! __asm__ (
" subl %2, %0 ; " /* do the subtraction */
" jno 0f ; " /* check for overflow */
***************
*** 214,218 ****
__PRECALCULATE_CONSTANTS(x / 65536.0 * y)
{
! asm (
" movl %2, %%eax ; "
" imull %3 ; " /* do the multiply */
--- 214,218 ----
__PRECALCULATE_CONSTANTS(x / 65536.0 * y)
{
! __asm__ (
" movl %2, %%eax ; "
" imull %3 ; " /* do the multiply */
***************
*** 267,271 ****
__PRECALCULATE_CONSTANTS(x * 65536.0 / y)
{
! asm (
" testl %%eax, %%eax ; " /* test sign of x */
" js 3f ; "
--- 267,271 ----
__PRECALCULATE_CONSTANTS(x * 65536.0 / y)
{
! __asm__ (
" testl %%eax, %%eax ; " /* test sign of x */
" js 3f ; "
***************
*** 347,351 ****
int result;
! asm (
" sarl $16, %0 " /* convert to int */
--- 347,351 ----
int result;
! __asm__ (
" sarl $16, %0 " /* convert to int */
***************
*** 368,372 ****
int result;
! asm (
" addl $0xFFFF, %0 ;" /* ceil () */
" jns 0f ;"
--- 368,372 ----
int result;
! __asm__ (
" addl $0xFFFF, %0 ;" /* ceil () */
" jns 0f ;"
Index: albecfg.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/albecfg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** albecfg.h 8 Jun 2003 19:24:57 -0000 1.3
--- albecfg.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 35,38 ****
--- 35,39 ----
#define ALLEGRO_LITTLE_ENDIAN
#define ALLEGRO_CONSOLE_OK
+ #define ALLEGRO_USE_CONSTRUCTOR
/* arrange for other headers to be included later on */
Index: aldjgpp.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/aldjgpp.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** aldjgpp.h 8 Jun 2003 19:24:57 -0000 1.3
--- aldjgpp.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 31,37 ****
--- 31,39 ----
#define ALLEGRO_PLATFORM_STR "djgpp"
#define ALLEGRO_DOS
+ #define ALLEGRO_I386
#define ALLEGRO_LITTLE_ENDIAN
#define ALLEGRO_CONSOLE_OK
#define ALLEGRO_VRAM_SINGLE_SURFACE
+ #define ALLEGRO_USE_CONSTRUCTOR
***************
*** 41,49 ****
#define END_OF_FUNCTION(x) void x##_end(void) { }
#define END_OF_STATIC_FUNCTION(x) static void x##_end(void) { }
! #define LOCK_DATA(d, s) _go32_dpmi_lock_data(d, s)
! #define LOCK_CODE(c, s) _go32_dpmi_lock_code(c, s)
! #define UNLOCK_DATA(d,s) _unlock_dpmi_data(d, s)
#define LOCK_VARIABLE(x) LOCK_DATA((void *)&x, sizeof(x))
! #define LOCK_FUNCTION(x) LOCK_CODE(x, (long)x##_end - (long)x)
--- 43,51 ----
#define END_OF_FUNCTION(x) void x##_end(void) { }
#define END_OF_STATIC_FUNCTION(x) static void x##_end(void) { }
! #define LOCK_DATA(d, s) _go32_dpmi_lock_data((void *)d, s)
! #define LOCK_CODE(c, s) _go32_dpmi_lock_code((void *)c, s)
! #define UNLOCK_DATA(d,s) _unlock_dpmi_data((void *)d, s)
#define LOCK_VARIABLE(x) LOCK_DATA((void *)&x, sizeof(x))
! #define LOCK_FUNCTION(x) LOCK_CODE((void *)x, (long)x##_end - (long)x)
***************
*** 75,79 ****
#ifndef AL_INLINE
! extern inline /* special bodge because AL_INLINE isn't defined yet */
#endif
void bmp_write24(unsigned long addr, int c)
--- 77,81 ----
#ifndef AL_INLINE
! extern __inline__ /* special bodge because AL_INLINE isn't defined yet */
#endif
void bmp_write24(unsigned long addr, int c)
Index: almaccfg.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/almaccfg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** almaccfg.h 8 Jun 2003 19:24:57 -0000 1.3
--- almaccfg.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 34,38 ****
#define INLINE
! #define ZERO_SIZE 64
#define AL_CONST const
#define AL_VAR(type, name) extern type name
--- 34,38 ----
#define INLINE
! #define ZERO_SIZE_ARRAY(type, name) type name[64]
#define AL_CONST const
#define AL_VAR(type, name) extern type name
***************
*** 47,55 ****
#define END_OF_FUNCTION(x) void x##_end(void) { }
#define END_OF_STATIC_FUNCTION(x) static void x##_end(void) { }
! #define LOCK_DATA(d, s) _mac_lock(d, s)
! #define LOCK_CODE(c, s) _mac_lock(c, s)
! #define UNLOCK_DATA(d,s) _mac_unlock(d, s)
#define LOCK_VARIABLE(x) LOCK_DATA((void *)&x, sizeof(x))
! #define LOCK_FUNCTION(x) LOCK_CODE(x, (long)x##_end - (long)x)
/* long filename status */
--- 47,55 ----
#define END_OF_FUNCTION(x) void x##_end(void) { }
#define END_OF_STATIC_FUNCTION(x) static void x##_end(void) { }
! #define LOCK_DATA(d, s) _mac_lock((void *)d, s)
! #define LOCK_CODE(c, s) _mac_lock((void *)c, s)
! #define UNLOCK_DATA(d,s) _mac_unlock((void *)d, s)
#define LOCK_VARIABLE(x) LOCK_DATA((void *)&x, sizeof(x))
! #define LOCK_FUNCTION(x) LOCK_CODE((void *)x, (long)x##_end - (long)x)
/* long filename status */
Index: almngw32.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/almngw32.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** almngw32.h 8 Jun 2003 19:24:57 -0000 1.3
--- almngw32.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 37,40 ****
--- 37,41 ----
#define ALLEGRO_I386
#define ALLEGRO_LITTLE_ENDIAN
+ #define ALLEGRO_USE_CONSTRUCTOR
#ifdef USE_CONSOLE
Index: almsvc.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/almsvc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** almsvc.h 8 Jun 2003 19:24:57 -0000 1.3
--- almsvc.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 44,47 ****
--- 44,51 ----
#endif
+ #ifdef ALLEGRO_AND_MFC
+ #define ALLEGRO_NO_MAGIC_MAIN
+ #endif
+
/* describe how function prototypes look to MSVC */
Index: alplatf.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/alplatf.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alplatf.h 8 Jun 2003 19:24:57 -0000 1.3
--- alplatf.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 1,19 ****
/* generated by fix.bat */
!
! /* modified by orz */
!
! #if defined _MSC_VER
! # define ALLEGRO_MSVC
! #elif defined DJGPP
! # define ALLEGRO_DJGPP
! #elif defined MINGW
! # define ALLEGRO_MINGW32
! #elif defined BEOS
! # define ALLEGRO_BEOS
! #elif defined (unix) || defined (__unix__) || defined (UNIX)
! # define ALLEGRO_UNIX
! #elif defined MPW
! # define ALLEGRO_MPW
! #else
! # error Allegro is misconfigured
! #endif
--- 1,2 ----
/* generated by fix.bat */
! #define ALLEGRO_MSVC
Index: alqnx.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/alqnx.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alqnx.h 8 Jun 2003 19:24:57 -0000 1.3
--- alqnx.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 22,25 ****
--- 22,26 ----
#ifndef USE_CONSOLE
+ #define ALLEGRO_MAGIC_MAIN
#define main _mangled_main
#undef END_OF_MAIN
Index: alqnxcfg.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/alqnxcfg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alqnxcfg.h 8 Jun 2003 19:24:57 -0000 1.3
--- alqnxcfg.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 46,49 ****
--- 46,50 ----
#define ALLEGRO_CONSOLE_OK
#define ALLEGRO_USE_SCHED_YIELD
+ #define ALLEGRO_USE_CONSTRUCTOR
/* arrange for other headers to be included later on */
Index: alunix.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/alunix.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alunix.h 8 Jun 2003 19:24:57 -0000 1.3
--- alunix.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 37,46 ****
#ifndef USE_CONSOLE
! # define main _mangled_main
! # undef END_OF_MAIN
! # define END_OF_MAIN() void *_mangled_main_address = (void*) _mangled_main;
#else
! # undef END_OF_MAIN
! # define END_OF_MAIN() void *_mangled_main_address;
#endif
--- 37,47 ----
#ifndef USE_CONSOLE
! #define ALLEGRO_MAGIC_MAIN
! #define main _mangled_main
! #undef END_OF_MAIN
! #define END_OF_MAIN() void *_mangled_main_address = (void*) _mangled_main;
#else
! #undef END_OF_MAIN
! #define END_OF_MAIN() void *_mangled_main_address;
#endif
***************
*** 101,104 ****
--- 102,120 ----
#endif /* ALLEGRO_WITH_ESDDIGI */
+ #ifdef ALLEGRO_WITH_ARTSDIGI
+
+ #define DIGI_ARTS AL_ID('A','R','T','S')
+
+ #ifndef ALLEGRO_WITH_MODULES
+
+ AL_VAR(DIGI_DRIVER, digi_arts);
+
+ #define DIGI_DRIVER_ARTS \
+ { DIGI_ARTS, &digi_arts, TRUE },
+
+ #endif
+
+ #endif /* ALLEGRO_WITH_ARTSDIGI */
+
#ifdef ALLEGRO_WITH_ALSADIGI
***************
*** 236,255 ****
/* Port I/O functions -- maybe these should be internal */
! static inline void outportb(unsigned short port, unsigned char value)
{
__asm__ volatile ("outb %0, %1" : : "a" (value), "d" (port));
}
! static inline void outportw(unsigned short port, unsigned short value)
{
__asm__ volatile ("outw %0, %1" : : "a" (value), "d" (port));
}
! static inline void outportl(unsigned short port, unsigned long value)
{
__asm__ volatile ("outl %0, %1" : : "a" (value), "d" (port));
}
! static inline unsigned char inportb(unsigned short port)
{
unsigned char value;
--- 252,271 ----
/* Port I/O functions -- maybe these should be internal */
! static INLINE void outportb(unsigned short port, unsigned char value)
{
__asm__ volatile ("outb %0, %1" : : "a" (value), "d" (port));
}
! static INLINE void outportw(unsigned short port, unsigned short value)
{
__asm__ volatile ("outw %0, %1" : : "a" (value), "d" (port));
}
! static INLINE void outportl(unsigned short port, unsigned long value)
{
__asm__ volatile ("outl %0, %1" : : "a" (value), "d" (port));
}
! static INLINE unsigned char inportb(unsigned short port)
{
unsigned char value;
***************
*** 258,262 ****
}
! static inline unsigned short inportw(unsigned short port)
{
unsigned short value;
--- 274,278 ----
}
! static INLINE unsigned short inportw(unsigned short port)
{
unsigned short value;
***************
*** 265,269 ****
}
! static inline unsigned long inportl(unsigned short port)
{
unsigned long value;
--- 281,285 ----
}
! static INLINE unsigned long inportl(unsigned short port)
{
unsigned long value;
Index: alunixac.hin
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/alunixac.hin,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alunixac.hin 8 Jun 2003 19:24:57 -0000 1.3
--- alunixac.hin 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 81,84 ****
--- 81,87 ----
#undef ALLEGRO_WITH_ESDDIGI
+ /* Define if aRts DIGI driver is supported. */
+ #undef ALLEGRO_WITH_ARTSDIGI
+
/* Define to (void *)-1, if MAP_FAILED is not defined. */
#undef MAP_FAILED
Index: alwatcom.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/alwatcom.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alwatcom.h 8 Jun 2003 19:24:57 -0000 1.3
--- alwatcom.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 34,38 ****
! #pragma disable_message (120 201)
--- 34,38 ----
! #pragma disable_message (120 201 202)
***************
*** 49,52 ****
--- 49,56 ----
#if __WATCOMC__ >= 1100
#define ALLEGRO_MMX
+ #endif
+
+ #if __WATCOMC__ >= 1200 /* Open Watcom 1.0 */
+ #define AL_CONST const
#endif
Index: alwin.h
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/platform/alwin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alwin.h 8 Jun 2003 19:24:57 -0000 1.3
--- alwin.h 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 31,78 ****
#if (!defined ALLEGRO_NO_MAGIC_MAIN) && (!defined ALLEGRO_SRC)
#define main _mangled_main
-
#undef END_OF_MAIN
! #ifdef ALLEGRO_GCC
! #ifdef __cplusplus
!
! /* GCC version for C++ programs, using __attribute__ ((stdcall)) */
! #define END_OF_MAIN() \
! \
! extern "C" { \
! int __attribute__ ((stdcall)) WinMain(void *hI, void *hP, char *Cmd, int nShow); \
! \
! } \
! \
! int __attribute__ ((stdcall)) WinMain(void *hI, void *hP, char *Cmd, int nShow) \
! { \
! return _WinMain((void *)_mangled_main, hI, hP, Cmd, nShow); \
! }
!
! #else /* not C++ */
!
! /* GCC version for C programs, using __attribute__ ((stdcall)) */
! #define END_OF_MAIN() \
! \
! int __attribute__ ((stdcall)) WinMain(void *hI, void *hP, char *Cmd, int nShow); \
! \
! int __attribute__ ((stdcall)) WinMain(void *hI, void *hP, char *Cmd, int nShow) \
! { \
! return _WinMain((void *)_mangled_main, hI, hP, Cmd, nShow); \
! }
! #endif /* end of not C++ */
! #else /* end of GCC */
- /* MSVC version, using __stdcall */
#define END_OF_MAIN() \
\
! int __stdcall WinMain(void *hI, void *hP, char *Cmd, int nShow) \
{ \
! return _WinMain((void *)_mangled_main, hI, hP, Cmd, nShow); \
}
-
- #endif
#endif
--- 31,51 ----
#if (!defined ALLEGRO_NO_MAGIC_MAIN) && (!defined ALLEGRO_SRC)
+ #define ALLEGRO_MAGIC_MAIN
#define main _mangled_main
#undef END_OF_MAIN
! /* disable strict pointer typing because of the vague prototype below */
! #define NO_STRICT
! #ifdef __cplusplus
! extern "C" int __stdcall WinMain(void *hInst, void *hPrev, char *Cmd, int nShow);
! #endif
#define END_OF_MAIN() \
\
! int __stdcall WinMain(void *hInst, void *hPrev, char *Cmd, int nShow) \
{ \
! return _WinMain((void *)_mangled_main, hInst, hPrev, Cmd, nShow); \
}
#endif
|
|
From: <yu...@us...> - 2003-11-15 01:37:45
|
Update of /cvsroot/timewarp/include/allegro/inline
In directory sc8-pr-cvs1:/tmp/cvs-serv31203/include/allegro/inline
Modified Files:
system.inl
Log Message:
Fixed Allegro migration to 4.0.3 bug
Index: system.inl
===================================================================
RCS file: /cvsroot/timewarp/include/allegro/inline/system.inl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** system.inl 8 Jun 2003 19:24:56 -0000 1.3
--- system.inl 15 Nov 2003 01:37:38 -0000 1.4
***************
*** 27,31 ****
! AL_INLINE(void, set_window_title, (char *name),
{
ASSERT(system_driver);
--- 27,31 ----
! AL_INLINE(void, set_window_title, (AL_CONST char *name),
{
ASSERT(system_driver);
|
|
From: <yu...@us...> - 2003-11-15 00:27:40
|
Update of /cvsroot/timewarp/lib In directory sc8-pr-cvs1:/tmp/cvs-serv20394/lib Modified Files: aldat.lib alld.exp alld.lib alld40.dll alleg.exp alleg.lib alleg40.dll Log Message: Dancing with tambourine around allegro Index: aldat.lib =================================================================== RCS file: /cvsroot/timewarp/lib/aldat.lib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsJqUjBd and /tmp/cvssCtErg differ Index: alld.exp =================================================================== RCS file: /cvsroot/timewarp/lib/alld.exp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvse27AVd and /tmp/cvsqWGpBh differ Index: alld.lib =================================================================== RCS file: /cvsroot/timewarp/lib/alld.lib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsfOa83e and /tmp/cvsO3Y76m differ Index: alld40.dll =================================================================== RCS file: /cvsroot/timewarp/lib/alld40.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsefzpQi and /tmp/cvsHAWcNo differ Index: alleg.exp =================================================================== RCS file: /cvsroot/timewarp/lib/alleg.exp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsCtG6Sj and /tmp/cvsSk3nwt differ Index: alleg.lib =================================================================== RCS file: /cvsroot/timewarp/lib/alleg.lib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvspNAmRk and /tmp/cvs2iD9Ky differ Index: alleg40.dll =================================================================== RCS file: /cvsroot/timewarp/lib/alleg40.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs295nuo and /tmp/cvsMrxUaI differ |
|
From: <yu...@us...> - 2003-11-15 00:27:40
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1:/tmp/cvs-serv20394 Modified Files: alleg40.dll Log Message: Dancing with tambourine around allegro |
|
From: <geo...@us...> - 2003-11-14 13:06:09
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1:/tmp/cvs-serv11868 Modified Files: server.ini Log Message: changed back default HideCloakers to "true", after discussion with JP and UAF. It's best this way, cause the Ilwrath (and other cloakers) ship points are adapted for it already. |
|
From: <yu...@us...> - 2003-11-14 07:59:33
|
Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv25299/source/melee
Modified Files:
mfleet.h
Log Message:
Cosmetic changes
Index: mfleet.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mfleet.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mfleet.h 14 Nov 2003 00:12:08 -0000 1.10
--- mfleet.h 14 Nov 2003 07:59:30 -0000 1.11
***************
*** 40,49 ****
SORTING_METHOD_CODERS, /**< */
SORTING_METHOD_ORIGIN, /**< SC1-3, TW, or the group that made the ship */
};
- enum { SORTING_METHOD_DEFAULT = SORTING_METHOD_NAME }; /**< Currently does the same thing as SORTING_METHOD_NAME_DESCENDING */
- enum { MAX_SORTING_METHODS = SORTING_METHOD_ORIGIN };
-
-
/**
*/
--- 40,47 ----
SORTING_METHOD_CODERS, /**< */
SORTING_METHOD_ORIGIN, /**< SC1-3, TW, or the group that made the ship */
+ SORTING_METHOD_DEFAULT = SORTING_METHOD_NAME, /**< Currently does the same thing as SORTING_METHOD_NAME_DESCENDING */
+ MAX_SORTING_METHODS = SORTING_METHOD_ORIGIN
};
/**
*/
|
|
From: <yu...@us...> - 2003-11-14 00:51:22
|
Update of /cvsroot/timewarp/include In directory sc8-pr-cvs1:/tmp/cvs-serv31362 Modified Files: allegro.h winalleg.h Log Message: replace 4.0.2 version with 4.0.3 version Index: allegro.h =================================================================== RCS file: /cvsroot/timewarp/include/allegro.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** allegro.h 8 Jun 2003 19:24:56 -0000 1.3 --- allegro.h 14 Nov 2003 00:51:19 -0000 1.4 *************** *** 10,16 **** * * Main header file for the entire Allegro library. ! * Separate modules can be included from the allegro/ directory. * * By Shawn Hargreaves. * * See readme.txt for copyright information. --- 10,18 ---- * * Main header file for the entire Allegro library. ! * (separate modules can be included from the allegro/ directory) * * By Shawn Hargreaves. + * + * Vincent Penquerc'h split the original allegro.h into separate headers. * * See readme.txt for copyright information. Index: winalleg.h =================================================================== RCS file: /cvsroot/timewarp/include/winalleg.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** winalleg.h 8 Jun 2003 19:24:56 -0000 1.3 --- winalleg.h 14 Nov 2003 00:51:19 -0000 1.4 *************** *** 32,39 **** #endif - #ifndef ALLEGRO_NO_MAGIC_MAIN - #define NO_STRICT /* needed by the magic main emulation */ - #endif - --- 32,35 ---- |
|
From: <yu...@us...> - 2003-11-14 00:12:13
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1:/tmp/cvs-serv23931 Modified Files: makefile twwin.dsp Log Message: Added Allegro ASSERT support for MSVC, enhanced for MinGW Index: twwin.dsp =================================================================== RCS file: /cvsroot/timewarp/twwin.dsp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** twwin.dsp 10 Nov 2003 11:43:00 -0000 1.35 --- twwin.dsp 14 Nov 2003 00:12:07 -0000 1.36 *************** *** 72,76 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /G6 /MDd /W3 /Gm /GR /GX /ZI /Op /I "./include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "__i386__" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 72,76 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /G6 /MDd /W3 /Gm /GR /GX /ZI /Op /I "./include" /D "_DEBUG" /D "DEBUGMODE" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "__i386__" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 |
|
From: <yu...@us...> - 2003-11-14 00:12:13
|
Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv23931/source/melee
Modified Files:
mfleet.h
Log Message:
Added Allegro ASSERT support for MSVC, enhanced for MinGW
Index: mfleet.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mfleet.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mfleet.h 12 Nov 2003 17:35:30 -0000 1.9
--- mfleet.h 14 Nov 2003 00:12:08 -0000 1.10
***************
*** 81,89 ****
\return the new fleet size */
FleetCost cycleMaxFleetCost() {
! ASSERT (!( (size != FLEET_COST_SMALL) &&
! (size != FLEET_COST_MEDIUM) &&
! (size != FLEET_COST_LARGE) &&
! (size != FLEET_COST_HUGE) &&
! (size != FLEET_COST_MASSIVE) ));
switch (maxFleetCost) {
--- 81,89 ----
\return the new fleet size */
FleetCost cycleMaxFleetCost() {
! ASSERT (!( (maxFleetCost != FLEET_COST_SMALL) &&
! (maxFleetCost != FLEET_COST_MEDIUM) &&
! (maxFleetCost != FLEET_COST_LARGE) &&
! (maxFleetCost != FLEET_COST_HUGE) &&
! (maxFleetCost != FLEET_COST_MASSIVE) ));
switch (maxFleetCost) {
|
|
From: <yu...@us...> - 2003-11-14 00:09:54
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1:/tmp/cvs-serv22346 Modified Files: alld40.dll alleg40.dll Log Message: replace 4.0.2 version with 4.0.3 version Index: alleg40.dll =================================================================== RCS file: /cvsroot/timewarp/alleg40.dll,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsjOq8QF and /tmp/cvseFNqFj differ |
|
From: <you...@us...> - 2003-11-13 19:08:50
|
Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv22389/source/melee
Modified Files:
mship.cpp
Log Message:
made the ship catagory case-insensitive
Index: mship.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mship.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mship.cpp 13 Nov 2003 00:41:05 -0000 1.16
--- mship.cpp 13 Nov 2003 19:08:47 -0000 1.17
***************
*** 131,135 ****
int &ori = shiptypes[i].origin;
ori = SHIP_ORIGIN_NONE;
! const char *origname = get_config_string("Info", "Origin", NULL);
if (strcmp(origname, "SC1") == 0)
ori = SHIP_ORIGIN_SC1;
--- 131,136 ----
int &ori = shiptypes[i].origin;
ori = SHIP_ORIGIN_NONE;
! char *origname = (char*)get_config_string("Info", "Origin", NULL);
! strupr(origname);
if (strcmp(origname, "SC1") == 0)
ori = SHIP_ORIGIN_SC1;
***************
*** 138,145 ****
if (strcmp(origname, "SC3") == 0)
ori = SHIP_ORIGIN_SC3;
! if ( (strcmp(origname, "TWa") == 0) || // alpha ships
(strcmp(origname, "TW") == 0) )
ori = SHIP_ORIGIN_TW_ALPHA;
! if (strcmp(origname, "TWb") == 0) // beta ships
ori = SHIP_ORIGIN_TW_BETA;
--- 139,146 ----
if (strcmp(origname, "SC3") == 0)
ori = SHIP_ORIGIN_SC3;
! if ( (strcmp(origname, "TWA") == 0) || // alpha ships
(strcmp(origname, "TW") == 0) )
ori = SHIP_ORIGIN_TW_ALPHA;
! if (strcmp(origname, "TWB") == 0) // beta ships
ori = SHIP_ORIGIN_TW_BETA;
|
5 messages has been excluded from this view by a project administrator.
