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: <yu...@us...> - 2004-01-13 01:15:34
|
Update of /cvsroot/timewarp/source/gamex/general In directory sc8-pr-cvs1:/tmp/cvs-serv10225/source/gamex/general Modified Files: sprites.cpp Log Message: removed ugly "../" from include directive Index: sprites.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/general/sprites.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sprites.cpp 5 Jan 2004 22:41:12 -0000 1.4 --- sprites.cpp 13 Jan 2004 01:15:29 -0000 1.5 *************** *** 3,12 **** #include <stdio.h> ! #include "../../melee.h" REGISTER_FILE ! #include "../../util/aastr.h" ! #include "../../util/pmask.h" #include "sprites.h" --- 3,12 ---- #include <stdio.h> ! #include "melee.h" REGISTER_FILE ! #include "util/aastr.h" ! #include "util/pmask.h" #include "sprites.h" |
|
From: <yu...@us...> - 2004-01-13 01:15:33
|
Update of /cvsroot/timewarp/source/sc2ships
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/source/sc2ships
Modified Files:
shpchmav.cpp shpdruma.cpp shpkohma.cpp shpmeltr.cpp
shporzne.cpp shppkufu.cpp shpslypr.cpp shpsupbl.cpp
shpthrto.cpp shputwju.cpp shpzfpst.cpp
Log Message:
removed ugly "../" from include directive
Index: shpchmav.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shpchmav.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpchmav.cpp 30 Oct 2003 19:58:21 -0000 1.9
--- shpchmav.cpp 13 Jan 2004 01:15:29 -0000 1.10
***************
*** 1,7 ****
! #include "../ship.h"
REGISTER_FILE
! #include "../util/aastr.h"
! #include "../sc2ships.h"
--- 1,7 ----
! #include "ship.h"
REGISTER_FILE
! #include "util/aastr.h"
! #include "sc2ships.h"
Index: shpdruma.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shpdruma.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpdruma.cpp 12 Oct 2003 02:03:01 -0000 1.5
--- shpdruma.cpp 13 Jan 2004 01:15:29 -0000 1.6
***************
*** 1,3 ****
! #include "../ship.h"
REGISTER_FILE
--- 1,3 ----
! #include "ship.h"
REGISTER_FILE
***************
*** 7,11 ****
! #include "../sc2ships.h"
--- 7,11 ----
! #include "sc2ships.h"
Index: shpkohma.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shpkohma.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpkohma.cpp 8 Jun 2003 17:55:55 -0000 1.3
--- shpkohma.cpp 13 Jan 2004 01:15:29 -0000 1.4
***************
*** 1,7 ****
! #include "../ship.h"
REGISTER_FILE
! #include "../sc2ships.h"
class KohrAhBlade : public AnimatedShot {
--- 1,7 ----
! #include "ship.h"
REGISTER_FILE
! #include "sc2ships.h"
class KohrAhBlade : public AnimatedShot {
Index: shpmeltr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shpmeltr.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpmeltr.cpp 19 Nov 2003 22:13:23 -0000 1.6
--- shpmeltr.cpp 13 Jan 2004 01:15:29 -0000 1.7
***************
*** 1,7 ****
! #include "../ship.h"
REGISTER_FILE
! #include "../sc2ships.h"
class MelnormeShot : public Shot {
--- 1,7 ----
! #include "ship.h"
REGISTER_FILE
! #include "sc2ships.h"
class MelnormeShot : public Shot {
Index: shporzne.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shporzne.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shporzne.cpp 1 Nov 2003 13:24:26 -0000 1.9
--- shporzne.cpp 13 Jan 2004 01:15:29 -0000 1.10
***************
*** 1,9 ****
! #include "../ship.h"
REGISTER_FILE
! #include "../melee/mview.h"
! #include "../melee/mcbodies.h"
! #include "../sc2ships.h"
class OrzMissile : public Missile {
--- 1,9 ----
! #include "ship.h"
REGISTER_FILE
! #include "melee/mview.h"
! #include "melee/mcbodies.h"
! #include "sc2ships.h"
class OrzMissile : public Missile {
Index: shppkufu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shppkufu.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shppkufu.cpp 30 Oct 2003 19:58:21 -0000 1.8
--- shppkufu.cpp 13 Jan 2004 01:15:29 -0000 1.9
***************
*** 1,11 ****
! #include "../ship.h"
REGISTER_FILE
! #include "../melee/mcbodies.h"
! #include "../sc2ships.h"
! #include "../melee/mshppan.h"
! #include "../melee/mitems.h"
! #include "../melee/mview.h"
--- 1,11 ----
! #include "ship.h"
REGISTER_FILE
! #include "melee/mcbodies.h"
! #include "sc2ships.h"
! #include "melee/mshppan.h"
! #include "melee/mitems.h"
! #include "melee/mview.h"
Index: shpslypr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shpslypr.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpslypr.cpp 22 Dec 2003 10:29:45 -0000 1.10
--- shpslypr.cpp 13 Jan 2004 01:15:29 -0000 1.11
***************
*** 1,7 ****
! #include "../ship.h"
! #include "../sc2ships.h"
! #include "../frame.h"
REGISTER_FILE
--- 1,7 ----
! #include "ship.h"
! #include "sc2ships.h"
! #include "frame.h"
REGISTER_FILE
Index: shpsupbl.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shpsupbl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpsupbl.cpp 8 Jun 2003 17:55:55 -0000 1.3
--- shpsupbl.cpp 13 Jan 2004 01:15:29 -0000 1.4
***************
*** 1,6 ****
! #include "../ship.h"
REGISTER_FILE
! #include "../sc2ships.h"
SupoxBlade::SupoxBlade(Vector2 opos, double shipAngle,
--- 1,6 ----
! #include "ship.h"
REGISTER_FILE
! #include "sc2ships.h"
SupoxBlade::SupoxBlade(Vector2 opos, double shipAngle,
Index: shpthrto.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shpthrto.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpthrto.cpp 25 Oct 2003 14:30:22 -0000 1.8
--- shpthrto.cpp 13 Jan 2004 01:15:29 -0000 1.9
***************
*** 1,6 ****
! #include "../ship.h"
REGISTER_FILE
! #include "../sc2ships.h"
class ThraddashFlame : public Animation {
--- 1,6 ----
! #include "ship.h"
REGISTER_FILE
! #include "sc2ships.h"
class ThraddashFlame : public Animation {
Index: shputwju.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shputwju.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shputwju.cpp 8 Jun 2003 17:55:55 -0000 1.3
--- shputwju.cpp 13 Jan 2004 01:15:29 -0000 1.4
***************
*** 1,8 ****
! #include "../ship.h"
REGISTER_FILE
! #include "../frame.h"
! #include "../sc2ships.h"
UtwigJugger::UtwigJugger(Vector2 opos, double shipAngle,
--- 1,8 ----
! #include "ship.h"
REGISTER_FILE
! #include "frame.h"
! #include "sc2ships.h"
UtwigJugger::UtwigJugger(Vector2 opos, double shipAngle,
Index: shpzfpst.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shpzfpst.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpzfpst.cpp 26 Oct 2003 10:43:18 -0000 1.7
--- shpzfpst.cpp 13 Jan 2004 01:15:29 -0000 1.8
***************
*** 1,8 ****
! #include "../ship.h"
REGISTER_FILE
#include <math.h>
! #include "../sc2ships.h"
class ZoqFotPikShot : public Shot {
--- 1,8 ----
! #include "ship.h"
REGISTER_FILE
#include <math.h>
! #include "sc2ships.h"
class ZoqFotPikShot : public Shot {
|
|
From: <you...@us...> - 2004-01-12 23:24:55
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1:/tmp/cvs-serv22836 Added Files: TitleScreen.dat Log Message: adding new title screen music. |
|
From: <you...@us...> - 2004-01-12 23:24:55
|
Update of /cvsroot/timewarp/source
In directory sc8-pr-cvs1:/tmp/cvs-serv22836/source
Modified Files:
scp.cpp
Log Message:
adding new title screen music.
Index: scp.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/scp.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** scp.cpp 10 Jan 2004 22:27:58 -0000 1.33
--- scp.cpp 12 Jan 2004 23:24:51 -0000 1.34
***************
*** 64,68 ****
--- 64,72 ----
#include "melee/mfleet.h"
+ #include "jgmod.h"
+
+ //deprecated. This mode of using dat files is terrible, I can't believe
+ //this technique was ever created.
#define SCPGUI_MUSIC 0
#define SCPGUI_TITLE 1
***************
*** 204,207 ****
--- 208,229 ----
}
+ /**
+ loads up the title screen and music, and starts playing the background menu music.
+ */
+ void prepareTitleScreenAssets() {
+ scp = load_datafile("scpgui.dat");
+ if (!scp)
+ tw_error("Couldnt load title music");
+
+ Music * mymusic = load_mod("TitleScreen.dat#TITLEMUSIC");
+
+ //Music * mymusic = load_mod("scpgui.dat#SCPMUSIC");
+
+ if (!mymusic)
+ tw_error("Couldnt load title music");
+
+ sound.play_music( mymusic, TRUE);
+ }
+
enum {
***************
*** 447,452 ****
if (gui_stuff) {
! scp = load_datafile("scpgui.dat");
! sound.play_music((Music *)(scp[SCPGUI_MUSIC].dat), TRUE);
showTitle();
}
--- 469,482 ----
if (gui_stuff) {
! prepareTitleScreenAssets();
! /*scp = load_datafile("scpgui.dat");
!
! Music * mymusic = load_mod("test.dat#MYMUSIC");
! //Music * mymusic = load_mod("scpgui.dat#SCPMUSIC");
! if (!mymusic)
! tw_error("Couldnt load title music");*/
!
!
! //sound.play_music((Music *)(scp[SCPGUI_MUSIC].dat), TRUE);
showTitle();
}
***************
*** 564,571 ****
}
! scp = load_datafile("scpgui.dat");
if (!scp)
tw_error("Couldn't load scpgui.dat");
! sound.play_music((Music *)(scp[SCPGUI_MUSIC].dat), TRUE);
showTitle();
--- 594,611 ----
}
!
! prepareTitleScreenAssets();
!
! /*scp = load_datafile("scpgui.dat");
if (!scp)
tw_error("Couldn't load scpgui.dat");
! //sound.play_music((Music *)(scp[SCPGUI_MUSIC].dat), TRUE);
!
! Music * mymusic = load_mod("TitleScreen.dat#MYMUSIC");
! //Music * mymusic = load_mod("scpgui.dat#MYMUSIC");
! if (!mymusic)
! tw_error("Couldnt load title music");
! sound.play_music( mymusic, TRUE);*/
!
showTitle();
|
|
From: <yu...@us...> - 2004-01-11 19:41:02
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1:/tmp/cvs-serv17754 Added Files: twwin.dsp Log Message: Changed Visual Studio project file to text format |
|
From: <yu...@us...> - 2004-01-11 19:37:36
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1:/tmp/cvs-serv17004 Removed Files: twwin.dsp Log Message: no message |
|
From: <yu...@us...> - 2004-01-11 19:36:18
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1:/tmp/cvs-serv16643 Modified Files: twwin.dsp Added Files: TestQuest.lua Log Message: GOB Quest experiment Index: twwin.dsp =================================================================== RCS file: /cvsroot/timewarp/twwin.dsp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** twwin.dsp 10 Jan 2004 20:26:34 -0000 1.48 --- twwin.dsp 11 Jan 2004 19:36:14 -0000 1.49 *************** *** 332,335 **** --- 332,339 ---- # Begin Source File + SOURCE=.\source\games\gquest.cpp + # End Source File + # Begin Source File + SOURCE=.\source\games\gsamp2.cpp # End Source File *************** *** 1481,1484 **** --- 1485,1492 ---- SOURCE=.\source\games\gplexplr.h + # End Source File + # Begin Source File + + SOURCE=.\source\games\gquest.h # End Source File # Begin Source File |
|
From: <yu...@us...> - 2004-01-11 19:36:18
|
Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv16643/source/games
Modified Files:
ggob.cpp ggob.h
Log Message:
GOB Quest experiment
Index: ggob.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ggob.cpp 10 Jan 2004 22:27:59 -0000 1.11
--- ggob.cpp 11 Jan 2004 19:36:13 -0000 1.12
***************
*** 102,106 ****
gobplayer = (GobPlayer**) realloc(gobplayer, sizeof(GobPlayer*) * gobplayers);
gobplayer[i] = new GobPlayer();
! gobplayer[i]->init(control, new_team());
add_focus(control, control->channel);
return;
--- 102,106 ----
gobplayer = (GobPlayer**) realloc(gobplayer, sizeof(GobPlayer*) * gobplayers);
gobplayer[i] = new GobPlayer();
! gobplayer[i]->init(control, new_team(), this);
add_focus(control, control->channel);
return;
***************
*** 223,228 ****
for (i = 0; i < 19; i += 1) add(new GobAsteroid());
-
-
int server_players, client_players;
set_config_file("client.ini");
--- 223,226 ----
***************
*** 347,350 ****
--- 345,362 ----
void GobGame::calculate() {
STACKTRACE
+ int i;
+ for ( i = 0; i< gobplayers; i++)
+ {
+ GobPlayer * p = gobplayer[i];
+ if(! p->ship )
+ continue;
+
+ for ( std::list<Quest*>::iterator iQ = p->quest.begin();
+ iQ != p->quest.end();
+ iQ++ )
+ {
+ (*iQ)->Process();
+ }
+ }
if (next_add_new_enemy_time <= game_time) {
***************
*** 424,428 ****
Create random enemy ship if enemy limit is not riched. Also it patch some of the ships.
*/
! void GobGame::add_new_enemy() {
STACKTRACE
--- 436,440 ----
Create random enemy ship if enemy limit is not riched. Also it patch some of the ships.
*/
! void GobGame::add_new_enemy () {
STACKTRACE
***************
*** 522,525 ****
--- 534,544 ----
/*! \brief Free player resources */
GobPlayer::~GobPlayer() {
+ // Free quest resources
+ for( std::list<Quest*>::iterator iQ = quest.begin();
+ iQ != quest.end();
+ iQ++)
+ {
+ delete *iQ;
+ }
free (pair_list);
}
***************
*** 529,535 ****
\param team player team
*/
! void GobPlayer::init(Control *c, TeamCode team) {
STACKTRACE
channel = c->channel;
starbucks = 0;
--- 548,557 ----
\param team player team
*/
! void GobPlayer::init(Control *c, TeamCode team, GobGame * g) {
STACKTRACE
+ ggame = g;
+ quest.clear();
+
channel = c->channel;
starbucks = 0;
***************
*** 739,742 ****
--- 761,765 ----
#define STATION_DIALOG_NEWSHIP 2
#define STATION_DIALOG_REPAIR 3
+ #define STATION_DIALOG_QUEST 4
static DIALOG station_dialog[] =
{// (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp)
***************
*** 745,748 ****
--- 768,772 ----
{ d_button_proc, 385, 130, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Buy New Ship" , NULL, NULL },
{ d_button_proc, 385, 170, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Repair Ship" , NULL, NULL },
+ { d_button_proc, 385, 210, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Get Quest" , NULL, NULL },
{ d_text_proc, 185, 420, 270, 30, 255, 0, 0, 0, 0, 0, dialog_string[0], NULL, NULL },
{ d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL },
***************
*** 828,839 ****
}
break;
}
if (r == STATION_DIALOG_DEPART) break;
}
return;
! }
! /*! \brief ???
! \param other ???
*/
void GobStation::inflict_damage(SpaceObject *other) {
--- 852,867 ----
}
break;
+ case STATION_DIALOG_QUEST:
+ Quest * q = new Quest ( "TestQuest.lua", s, s->ggame );
+ s->quest.push_back(q);
+ break;
}
if (r == STATION_DIALOG_DEPART) break;
}
return;
! }
! /*! \brief Meet with station
! \param other location of object that colide with station
*/
void GobStation::inflict_damage(SpaceObject *other) {
Index: ggob.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ggob.h 10 Jan 2004 22:27:59 -0000 1.4
--- ggob.h 11 Jan 2004 19:36:13 -0000 1.5
***************
*** 2,5 ****
--- 2,7 ----
#define __GGOB_H__
+ #include <list>
+
#include "../melee.h"
#include "../melee/mframe.h"
***************
*** 7,16 ****
--- 9,26 ----
#include "../melee/mitems.h"
+ #include "../melee/mcbodies.h"
+
+ #include "gquest.h"
class Upgrade;
class GobStation;
+ class GobGame;
+
class GobPlayer {
public:
+ std::list<Quest*> quest;
+ GobGame * ggame;
+
int channel;
~GobPlayer();
***************
*** 35,39 ****
int value_buckazoids;
TeamCode team;
! void init(Control *c, TeamCode team);
void died(SpaceLocation *killer);
void new_ship(ShipType *type);
--- 45,49 ----
int value_buckazoids;
TeamCode team;
! void init(Control *c, TeamCode team, GobGame * g);
void died(SpaceLocation *killer);
void new_ship(ShipType *type);
|
|
From: <yu...@us...> - 2004-01-11 19:36:18
|
Update of /cvsroot/timewarp/source/gamex
In directory sc8-pr-cvs1:/tmp/cvs-serv16643/source/gamex
Modified Files:
gamegeneral.cpp gamegeneral.h
Log Message:
GOB Quest experiment
Index: gamegeneral.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamegeneral.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gamegeneral.cpp 4 Jan 2004 22:06:59 -0000 1.8
--- gamegeneral.cpp 11 Jan 2004 19:36:13 -0000 1.9
***************
*** 592,596 ****
! void createfilelist(char ***list, int *N, char *scanname, int remext)
{
int err;
--- 592,596 ----
! void createfilelist(char ***List, int *N, char *scanname, int remext)
{
int err;
***************
*** 610,614 ****
// allocate memory for the filenames
! *list = new char* [(*N)];
--- 610,614 ----
// allocate memory for the filenames
! *List = new char* [(*N)];
***************
*** 625,630 ****
if (!remext)
{
! (*list)[i] = new char [strlen(info.name)+1];
! strcpy((*list)[i], info.name);
} else {
--- 625,630 ----
if (!remext)
{
! (*List)[i] = new char [strlen(info.name)+1];
! strcpy((*List)[i], info.name);
} else {
***************
*** 653,658 ****
tmpstr[k-i1] = 0;
! (*list)[i] = new char [strlen(tmpstr)+1];
! strcpy((*list)[i], tmpstr);
}
++i;
--- 653,658 ----
tmpstr[k-i1] = 0;
! (*List)[i] = new char [strlen(tmpstr)+1];
! strcpy((*List)[i], tmpstr);
}
++i;
Index: gamegeneral.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamegeneral.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gamegeneral.h 10 Jan 2004 22:27:58 -0000 1.5
--- gamegeneral.h 11 Jan 2004 19:36:13 -0000 1.6
***************
*** 9,13 ****
void makevideobmp(BITMAP *&bmp);
! void createfilelist(char ***list, int *N, char *scanname, int remext);
--- 9,13 ----
void makevideobmp(BITMAP *&bmp);
! void createfilelist(char ***List, int *N, char *scanname, int remext);
|
|
From: <geo...@us...> - 2004-01-11 10:11:19
|
Update of /cvsroot/timewarp/gamex/types In directory sc8-pr-cvs1:/tmp/cvs-serv5973 Removed Files: planet_big.ini planet_dwarf.ini planet_giant.ini planet_medium.ini planet_small.ini star_big.ini star_dwarf.ini star_giant.ini star_medium.ini star_small.ini Log Message: deleting redundant files --- planet_big.ini DELETED --- --- planet_dwarf.ini DELETED --- --- planet_giant.ini DELETED --- --- planet_medium.ini DELETED --- --- planet_small.ini DELETED --- --- star_big.ini DELETED --- --- star_dwarf.ini DELETED --- --- star_giant.ini DELETED --- --- star_medium.ini DELETED --- --- star_small.ini DELETED --- |
|
From: <yu...@us...> - 2004-01-10 22:33:40
|
Update of /cvsroot/timewarp/source In directory sc8-pr-cvs1:/tmp/cvs-serv3024 Removed Files: gup.h Log Message: remove unneeded file --- gup.h DELETED --- |
Update of /cvsroot/timewarp/source/other
In directory sc8-pr-cvs1:/tmp/cvs-serv1655/source/other
Modified Files:
gup.h nullphas.h objanim.h orbit.h planet3d.h radar.h
shippart.h vbodies.cpp vbodies.h vtarget.h
Log Message:
Cosmetic changes, GOB documented in doxygen style, removed
redundand #ifndef directives
Index: gup.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/gup.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gup.h 11 Oct 2003 21:01:00 -0000 1.4
--- gup.h 10 Jan 2004 22:27:59 -0000 1.5
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef __GUP_H__
+ #define __GUP_H__
+
class Upgrade;
extern Upgrade **upgrade_list;
***************
*** 71,72 ****
--- 74,77 ----
GobRadar();
};*/
+
+ #endif // __GUP_H__
Index: nullphas.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/nullphas.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nullphas.h 8 Jun 2003 17:55:55 -0000 1.3
--- nullphas.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,8 ****
! #ifndef _MSHIP_H_
! #include "../melee/mship.h"
! #endif
! #ifndef _NULLPHAS_H_
! #define _NULLPHAS_H_
class NullPhaser : public Phaser {
--- 1,6 ----
! #ifndef __NULLPHAS_H__
! #define __NULLPHAS_H__
! #include "../melee/mship.h"
class NullPhaser : public Phaser {
***************
*** 16,18 ****
};
! #endif
--- 14,16 ----
};
! #endif // __NULLPHAS_H__
Index: objanim.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/objanim.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** objanim.h 8 Jun 2003 17:55:55 -0000 1.3
--- objanim.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,12 ****
! #ifndef _MFRAME_H
! #include "../melee/mframe.h"
! #endif
! #ifndef _MANIM_H
#include "../melee/manim.h"
- #endif
-
- #ifndef _OBJANIM_H
- #define _OBJANIM_H
class ObjectAnimation : public Animation {
--- 1,7 ----
! #ifndef __OBJANIM_H__
! #define __OBJANIM_H__
! #include "../melee/mframe.h"
#include "../melee/manim.h"
class ObjectAnimation : public Animation {
***************
*** 23,25 ****
};
! #endif
--- 18,20 ----
};
! #endif // __OBJANIM_H__
Index: orbit.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/orbit.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** orbit.h 8 Jun 2003 17:55:55 -0000 1.3
--- orbit.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,4 ****
! #ifndef _ORBIT_H
! #define _ORBIT_H
//#include <allegro.h>
--- 1,4 ----
! #ifndef __ORBIT_H__
! #define __ORBIT_H__
//#include <allegro.h>
***************
*** 64,66 ****
};
! #endif
--- 64,66 ----
};
! #endif // __ORBIT_H__
Index: planet3d.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/planet3d.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** planet3d.h 19 Dec 2003 23:33:35 -0000 1.1
--- planet3d.h 10 Jan 2004 22:27:59 -0000 1.2
***************
*** 1,4 ****
! #ifndef _PLANET_3D_
! #define _PLANET_3D_
--- 1,4 ----
! #ifndef __PLANET_3D__
! #define __PLANET_3D__
***************
*** 56,60 ****
};
!
!
! #endif
--- 56,58 ----
};
! #endif // __PLANET_3D__
Index: radar.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/radar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** radar.h 8 Jun 2003 17:55:55 -0000 1.3
--- radar.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef __RADAR_H__
+ #define __RADAR_H__
+
#include <allegro.h>
#include <stdio.h>
***************
*** 35,36 ****
--- 38,41 ----
~ZRadar();
};
+
+ #endif // __RADAR_H__
Index: shippart.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/shippart.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shippart.h 22 Dec 2003 10:29:44 -0000 1.6
--- shippart.h 10 Jan 2004 22:27:59 -0000 1.7
***************
*** 91,94 ****
! #endif
--- 91,94 ----
! #endif // __SHIPPART__
Index: vbodies.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/vbodies.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** vbodies.cpp 13 Dec 2003 14:31:09 -0000 1.8
--- vbodies.cpp 10 Jan 2004 22:27:59 -0000 1.9
***************
*** 4,14 ****
#include <stdio.h>
- #ifndef _V_BODIES_H
#include "vbodies.h"
- #endif
-
- #ifndef _VECTOR2_H
#include "../util/vector2.h"
! #endif
#include "../melee.h"
--- 4,10 ----
#include <stdio.h>
#include "vbodies.h"
#include "../util/vector2.h"
!
#include "../melee.h"
***************
*** 24,31 ****
#include "../melee/mship.h"
#include "../melee/mgame.h"
- #ifndef _ORBIT_H
#include "../other/orbit.h"
#include "../other/vtarget.h"
! #endif
//this file belongs in the \other directory.
--- 20,26 ----
#include "../melee/mship.h"
#include "../melee/mgame.h"
#include "../other/orbit.h"
#include "../other/vtarget.h"
!
//this file belongs in the \other directory.
Index: vbodies.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/vbodies.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** vbodies.h 8 Jun 2003 16:40:30 -0000 1.3
--- vbodies.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,28 ****
//this file belongs in the \other directory
! #ifndef _V_BODIES_H
! #define _V_BODIES_H
! #endif
!
- #ifndef _MELEE_H
#include "../melee.h"
- #endif
-
- #ifndef _MCBODIES_H
#include "../melee/mcbodies.h"
- #endif
-
- #ifndef _ORBIT_H
#include "../other/orbit.h"
- #endif
-
- #ifndef _MFRAME_H
#include "../melee/mframe.h"
- #endif
-
- #ifndef _MSHOT_H
#include "../melee/mshot.h"
- #endif
#include "../other/vtarget.h"
--- 1,12 ----
//this file belongs in the \other directory
! #ifndef __VBODIES_H__
! #define __VBODIES_H__
#include "../melee.h"
#include "../melee/mcbodies.h"
#include "../other/orbit.h"
#include "../melee/mframe.h"
#include "../melee/mshot.h"
#include "../other/vtarget.h"
***************
*** 678,680 ****
};
!
--- 662,664 ----
};
! #endif // __VBODIES_H__
Index: vtarget.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/vtarget.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** vtarget.h 20 Oct 2003 14:46:14 -0000 1.4
--- vtarget.h 10 Jan 2004 22:27:59 -0000 1.5
***************
*** 1,4 ****
! #ifndef _V_TARGET
! #define _V_TARGET
//this file should be placed in the /other directory
class AimSys {
--- 1,5 ----
! #ifndef __VTARGET__
! #define __VTARGET__
!
//this file should be placed in the /other directory
class AimSys {
***************
*** 71,74 ****
! #endif
--- 72,75 ----
! #endif // __VTARGET__
|
|
From: <yu...@us...> - 2004-01-10 22:28:03
|
Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv1655/source/melee
Modified Files:
manim.h mcbodies.h mcontrol.h mfleet.h mframe.h mgame.h mlog.h
mmain.h mnet1.h mship.h mshot.h mshppan.h mtarget.h mview.h
Log Message:
Cosmetic changes, GOB documented in doxygen style, removed
redundand #ifndef directives
Index: manim.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/manim.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** manim.h 8 Jun 2003 17:55:51 -0000 1.3
--- manim.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,9 ****
! #ifndef _MFRAME_H
! #include "mframe.h"
! #endif
!
! #ifndef _MANIM_H
! #define _MANIM_H
class Animation : public SpaceObject {
--- 1,6 ----
! #ifndef __MANIM_H__
! #define __MANIM_H__
+ #include "mframe.h"
class Animation : public SpaceObject {
***************
*** 45,47 ****
};
! #endif
--- 42,44 ----
};
! #endif // __MANIM_H__
Index: mcbodies.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcbodies.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mcbodies.h 25 Oct 2003 02:35:52 -0000 1.4
--- mcbodies.h 10 Jan 2004 22:27:59 -0000 1.5
***************
*** 1,11 ****
! #ifndef _MELEE_H
#include "../melee.h"
- #endif
- #ifndef _MFRAME_H
#include "mframe.h"
- #endif
-
- #ifndef _MCBODIES_H
- #define _MCBODIES_H
--- 1,8 ----
!
! #ifndef __MCBODIES_H__
! #define __MCBODIES_H__
!
#include "../melee.h"
#include "mframe.h"
***************
*** 132,134 ****
);
! #endif
--- 129,131 ----
);
! #endif // __MCBODIES_H__
Index: mcontrol.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcontrol.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mcontrol.h 21 Nov 2003 10:24:29 -0000 1.5
--- mcontrol.h 10 Jan 2004 22:27:59 -0000 1.6
***************
*** 1,14 ****
! #ifndef _MELEE_H
#include "../melee.h"
- #endif
- #ifndef _MMAIN_H
#include "mframe.h"
- #endif
- #ifndef _MSHIP_H
#include "mship.h"
- #endif
-
- #ifndef _MCONTROL_H
- #define _MCONTROL_H
extern const char num_controls;
--- 1,8 ----
! #ifndef __MCONTROL_H__
! #define __MCONTROL_H__
!
#include "../melee.h"
#include "mframe.h"
#include "mship.h"
extern const char num_controls;
***************
*** 93,95 ****
! #endif
--- 87,89 ----
! #endif // __MCONTROL_H__
Index: mfleet.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mfleet.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mfleet.h 14 Nov 2003 07:59:30 -0000 1.11
--- mfleet.h 10 Jan 2004 22:27:59 -0000 1.12
***************
*** 1,4 ****
! #ifndef _MFLEET_H
! #define _MFLEET_H
#include "../melee.h"
--- 1,4 ----
! #ifndef __MFLEET_H__
! #define __MFLEET_H__
#include "../melee.h"
***************
*** 256,263 ****
};
!
!
!
!
! #endif
--- 256,259 ----
};
! #endif // __MFLEET_H__
Index: mframe.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mframe.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mframe.h 22 Dec 2003 12:03:17 -0000 1.12
--- mframe.h 10 Jan 2004 22:27:59 -0000 1.13
***************
*** 1,4 ****
! #ifndef _MFRAME_H
! #define _MFRAME_H
//debuging purposes only:
--- 1,4 ----
! #ifndef __MFRAME_H__
! #define __MFRAME_H__
//debuging purposes only:
***************
*** 397,399 ****
};
! #endif
--- 397,399 ----
};
! #endif // __MFRAME_H__
Index: mgame.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mgame.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mgame.h 22 Dec 2003 12:03:17 -0000 1.13
--- mgame.h 10 Jan 2004 22:27:59 -0000 1.14
***************
*** 1,9 ****
! #ifndef _MFRAME_H
! #include "mframe.h"
! #endif
!
! #ifndef _MGAME_H
! #define _MGAME_H
#include "mtarget.h"
--- 1,6 ----
! #ifndef __MGAME_H__
! #define __MGAME_H__
+ #include "mframe.h"
#include "mtarget.h"
***************
*** 202,205 ****
! #endif
--- 199,202 ----
! #endif // __MGAME_H__
Index: mlog.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mlog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mlog.h 8 Jun 2003 17:55:51 -0000 1.3
--- mlog.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,4 ****
! #ifndef _MLOG_H
! #define _MLOG_H
--- 1,4 ----
! #ifndef __MLOG_H__
! #define __MLOG_H__
***************
*** 64,66 ****
};
! #endif
--- 64,66 ----
};
! #endif // __MLOG_H__
Index: mmain.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mmain.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mmain.h 12 Dec 2003 16:01:56 -0000 1.5
--- mmain.h 10 Jan 2004 22:27:59 -0000 1.6
***************
*** 1,11 ****
! #ifndef _MELEE_H
#include "../melee.h"
- #endif
- #ifndef _MGAME_H
#include "mgame.h"
- #endif
-
- #ifndef _MMAIN_H
- #define _MMAIN_H
class NormalGame : public Game {
--- 1,7 ----
! #ifndef __MMAIN_H__
! #define __MMAIN_H__
!
#include "../melee.h"
#include "mgame.h"
class NormalGame : public Game {
***************
*** 62,64 ****
! #endif
--- 58,60 ----
! #endif // __MMAIN_H__
Index: mnet1.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mnet1.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mnet1.h 8 Jun 2003 17:55:52 -0000 1.3
--- mnet1.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,15 ****
! #ifndef _MMAIN_H
#include "mmain.h"
- #endif
- #ifndef _NET_TCP_H
#include "../util/net_tcp.h"
- #endif
- #ifndef _MLOG_H
#include "mlog.h"
- #endif
- #ifndef _MSHIP_H
#include "mship.h"
- #endif
-
--- 1,9 ----
! #ifndef __MNET1_H__
! #define __MNET1_H__
!
#include "mmain.h"
#include "../util/net_tcp.h"
#include "mlog.h"
#include "mship.h"
***************
*** 102,103 ****
--- 96,98 ----
};
+ #endif // __MNET1_H__
Index: mship.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mship.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mship.h 30 Dec 2003 09:27:38 -0000 1.13
--- mship.h 10 Jan 2004 22:27:59 -0000 1.14
***************
*** 1,9 ****
! #ifndef _MFRAME_H
! #include "mframe.h"
! #endif
!
! #ifndef _MSHIP_H
! #define _MSHIP_H
--- 1,6 ----
! #ifndef __MSHIP_H__
! #define __MSHIP_H__
+ #include "mframe.h"
***************
*** 181,184 ****
! #endif
--- 178,181 ----
! #endif // __MSHIP_H__
Index: mshot.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshot.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mshot.h 8 Jun 2003 17:55:52 -0000 1.3
--- mshot.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,11 ****
! #ifndef _MFRAME_H
#include "mframe.h"
- #endif
- #ifndef _MGAME_H
#include "mgame.h"
- #endif
-
- #ifndef _MSHOT_H
- #define _MSHOT_H
class Shot : public SpaceObject {
--- 1,7 ----
! #ifndef __MSHOT_H__
! #define __MSHOT_H__
!
#include "mframe.h"
#include "mgame.h"
class Shot : public SpaceObject {
***************
*** 110,112 ****
! #endif
--- 106,108 ----
! #endif // __MSHOT_H__
Index: mshppan.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshppan.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mshppan.h 29 Oct 2003 23:18:12 -0000 1.6
--- mshppan.h 10 Jan 2004 22:27:59 -0000 1.7
***************
*** 1,10 ****
! #ifndef _MELEE_H
! #include "../melee.h"
! #endif
!
!
! #ifndef _MSHPPAN_H
! #define _MSHPPAN_H
extern int PANEL_WIDTH;
--- 1,6 ----
! #ifndef __MSHPPAN_H__
! #define __MSHPPAN_H__
+ #include "../melee.h"
extern int PANEL_WIDTH;
***************
*** 67,69 ****
};
! #endif
--- 63,65 ----
};
! #endif // __MSHPPAN_H__
Index: mtarget.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mtarget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mtarget.h 22 Dec 2003 10:29:44 -0000 1.1
--- mtarget.h 10 Jan 2004 22:27:59 -0000 1.2
***************
*** 1,5 ****
! #ifndef _MTARGET_H_
! #define _MTARGET_H_
--- 1,5 ----
! #ifndef __MTARGET_H__
! #define __MTARGET_H__
***************
*** 35,37 ****
! #endif
--- 35,37 ----
! #endif // __MTARGET_H__
Index: mview.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mview.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mview.h 8 Jun 2003 17:55:52 -0000 1.3
--- mview.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,12 ****
! #ifndef _MELEE_H
#include "../melee.h"
- #endif
- #ifndef _MFRAME_H
#include "mframe.h"
- #endif
-
- #ifndef _MVIEW_H
- #define _MVIEW_H
-
//global flags: read/write
--- 1,7 ----
! #ifndef __MVIEW_H__
! #define __MVIEW_H__
!
#include "../melee.h"
#include "mframe.h"
//global flags: read/write
***************
*** 136,138 ****
! #endif
--- 131,133 ----
! #endif // __MVIEW_H__
|
Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv1655/source/games
Modified Files:
dialog.h gamehierarchy.h gdebugonly.cpp gflmelee.h ggob.cpp
ggob.h gmissions_objects.h gplexplr.cpp gplexplr.h gtrug.h
Log Message:
Cosmetic changes, GOB documented in doxygen style, removed
redundand #ifndef directives
Index: dialog.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/dialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dialog.h 11 Dec 2003 02:03:28 -0000 1.2
--- dialog.h 10 Jan 2004 22:27:59 -0000 1.3
***************
*** 6,11 ****
//////////////////////////////////////////////////////////////////////////
! #ifndef __DIALOG_MODULE__
! #define __DIALOG_MODULE__
extern "C" {
--- 6,11 ----
//////////////////////////////////////////////////////////////////////////
! #ifndef __DIALOG_MODULE_H__
! #define __DIALOG_MODULE_H__
extern "C" {
***************
*** 44,46 ****
! #endif // __DIALOG_MODULE__
--- 44,46 ----
! #endif // __DIALOG_MODULE_H__
Index: gamehierarchy.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/gamehierarchy.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gamehierarchy.h 26 Oct 2003 10:43:17 -0000 1.3
--- gamehierarchy.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,15 ****
! #ifndef __GAME_PLANET_VIEW__
! #define __GAME_PLANET_VIEW__
#include "../melee/mgame.h"
/*
! This class should allow you to start, play, end a game from within a game (while the
! other games are also running in the background). Games and their physics are independent.
!
! The GameStart is special, in that it hosts default melee game data, and also manages
! the games that are spawned.
!
*/
--- 1,14 ----
! #ifndef __GAMEHIERARCHY_H__
! #define __GAMEHIERARCHY_H__
#include "../melee/mgame.h"
/*
+ This class should allow you to start, play, end a game from within a
+ game (while the other games are also running in the background). Games
+ and their physics are independent.
! The GameStart is special, in that it hosts default melee game data, and
! also manages the games that are spawned.
*/
***************
*** 74,78 ****
! #endif
--- 73,77 ----
! #endif // __GAMEHIERARCHY_H__
Index: gdebugonly.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gdebugonly.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gdebugonly.cpp 2 Nov 2003 22:39:52 -0000 1.5
--- gdebugonly.cpp 10 Jan 2004 22:27:59 -0000 1.6
***************
*** 69,71 ****
! #endif
--- 69,71 ----
! #endif // _DEBUG
Index: gflmelee.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/gflmelee.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gflmelee.h 11 Oct 2003 21:00:59 -0000 1.2
--- gflmelee.h 10 Jan 2004 22:27:59 -0000 1.3
***************
*** 46,49 ****
};
! #endif
--- 46,49 ----
};
! #endif //__GFLMELEE_H__
Index: ggob.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ggob.cpp 21 Nov 2003 10:24:28 -0000 1.10
--- ggob.cpp 10 Jan 2004 22:27:59 -0000 1.11
***************
*** 38,41 ****
--- 38,47 ----
////////////////////////////////////////////////////////////////////////
+ /*! \brief Player who kill asteroid get his bukazoid.
+ \param source ??????
+ \param normal normal damage
+ \param direct direct damage
+ \return total damage to asteroid
+ */
int GobAsteroid::handle_damage (SpaceLocation *source, double normal, double direct) {
STACKTRACE
***************
*** 50,53 ****
--- 56,60 ----
}
+ /*! \brief After asteroid death show explosion and generate new asteroid */
void GobAsteroid::death () {
STACKTRACE
***************
*** 63,66 ****
--- 70,74 ----
}
+ /*! \brief Init various gob variables and stations sprites to NULL */
void GobGame::preinit() {
STACKTRACE
***************
*** 84,87 ****
--- 92,98 ----
}
+ /*! \brief Add player to game
+ \param control Player control
+ */
void GobGame::add_gobplayer(Control *control) {
STACKTRACE
***************
*** 95,98 ****
--- 106,113 ----
return;
}
+ /*! \brief Handle player death
+ At this point divinefavor upgrade can save player from such fate
+ \param killer ???
+ */
void GobPlayer::died(SpaceLocation *killer) {
STACKTRACE
***************
*** 108,111 ****
--- 123,132 ----
}
+ /*! \brief ???
+ \param sample ???
+ \param source ???
+ \param vol ???
+ \param freq ???
+ */
void GobGame::play_sound (SAMPLE *sample, SpaceLocation *source, int vol, int freq) {
STACKTRACE
***************
*** 120,123 ****
--- 141,150 ----
}
+ /*! \brief Init Game Stuff
+ Alloc memory for enemies, load game settings, load various game
+ sprites, set Hero view, include some hard understandable code for network
+ play
+ \param _log Game log I think
+ */
void GobGame::init(Log *_log) {
STACKTRACE
***************
*** 242,245 ****
--- 269,273 ----
return;
}
+ /*! \brief Free game resources */
GobGame::~GobGame() {
delete stationSprite[0];
***************
*** 258,261 ****
--- 286,297 ----
return;
}
+
+ /*! \brief Add planet and station
+ \param planet_sprite ???
+ \param planet_index ???
+ \param station_sprite ???
+ \param builds ???
+ \param background ???
+ */
void GobGame::add_planet_and_station ( SpaceSprite *planet_sprite, int planet_index, SpaceSprite *station_sprite, const char *builds, const char *background) {
STACKTRACE
***************
*** 281,284 ****
--- 317,321 ----
}
+ /*! \brief Print game information: enemies count, time, cordinates, money */
void GobGame::fps() {
STACKTRACE
***************
*** 305,313 ****
}
void GobGame::calculate() {
STACKTRACE
-
-
if (next_add_new_enemy_time <= game_time) {
next_add_new_enemy_time = game_time;
--- 342,351 ----
}
+ /*! \brief Add enemy to game
+ This function called once per frame of physics, used to add new enemys to the game
+ */
void GobGame::calculate() {
STACKTRACE
if (next_add_new_enemy_time <= game_time) {
next_add_new_enemy_time = game_time;
***************
*** 327,330 ****
--- 365,373 ----
return;
}
+
+ /*! \brief Search for requested enemy ship
+ \param what space location of enemy ship
+ \return enemy ship index, -1 if not found
+ */
int GobGame::get_enemy_index(SpaceLocation *what) {
STACKTRACE
***************
*** 338,341 ****
--- 381,389 ----
return -1;
}
+
+ /*! \brief ship death
+ \param who is killed
+ \param source loacation that killed?
+ */
void GobGame::ship_died(Ship *who, SpaceLocation *source) {
STACKTRACE
***************
*** 359,362 ****
--- 407,415 ----
return;
}
+
+ /*! \brief Get Player from location
+ \param what player location
+ \return player, NULL if no player
+ */
GobPlayer *GobGame::get_player(SpaceLocation *what) {
STACKTRACE
***************
*** 368,371 ****
--- 421,427 ----
return NULL;
}
+ /*! \brief Create enemy ship
+ Create random enemy ship if enemy limit is not riched. Also it patch some of the ships.
+ */
void GobGame::add_new_enemy() {
STACKTRACE
***************
*** 380,390 ****
"chmav", "plopl", "narlu"
};
! /* const int num_enemy_types = 10;
! static char *enemy_types[num_enemy_types] = {
! "thrto", "zfpst", "shosc",
! "syrpe", "druma", "mmrxf",
! "kzedr", "earcr", "chmav",
! "yehte"
! };*/
if (gobenemies == max_enemies) return;
GobEnemy *ge = new GobEnemy();
--- 436,440 ----
"chmav", "plopl", "narlu"
};
!
if (gobenemies == max_enemies) return;
GobEnemy *ge = new GobEnemy();
***************
*** 408,413 ****
200 100 11.01 26.49
-
-
*/
e = base;
--- 458,461 ----
***************
*** 444,448 ****
return;
}
!
void GobEnemy::init(Ship *ship, int kill_starbucks, int kill_buckazoids) {
STACKTRACE
--- 492,500 ----
return;
}
! /*! \brief Set amount starbucks and bukazoids for death
! \param ship enemy ship
! \param kill_starbucks amount starbucks
! \param kill_buckazoids amount buckazoids
! */
void GobEnemy::init(Ship *ship, int kill_starbucks, int kill_buckazoids) {
STACKTRACE
***************
*** 453,456 ****
--- 505,511 ----
return;
}
+ /*! \brief Give player his bounty
+ \param what location of player
+ */
void GobEnemy::died(SpaceLocation *what) {
STACKTRACE
***************
*** 465,472 ****
}
!
GobPlayer::~GobPlayer() {
free (pair_list);
}
void GobPlayer::init(Control *c, TeamCode team) {
STACKTRACE
--- 520,532 ----
}
! /*! \brief Free player resources */
GobPlayer::~GobPlayer() {
free (pair_list);
}
+
+ /*! brief Init player
+ \param c player control
+ \param team player team
+ */
void GobPlayer::init(Control *c, TeamCode team) {
STACKTRACE
***************
*** 494,498 ****
}
return;
! }
GobPlayer::pair *GobPlayer::_get_pair(const char *id) {
STACKTRACE
--- 554,560 ----
}
return;
! }
!
! /*! \brief Part of map<const char *, int> implementation, to be removed */
GobPlayer::pair *GobPlayer::_get_pair(const char *id) {
STACKTRACE
***************
*** 506,509 ****
--- 568,573 ----
return NULL;
}
+
+ /*! \brief Part of map<const char *, int> implementation, to be removed */
void GobPlayer::_add_pair(const char *id, int value) {
STACKTRACE
***************
*** 519,522 ****
--- 583,588 ----
return;
}
+
+ /*! \brief Part of map<const char *, int> implementation, to be removed */
int GobPlayer::read_pair(const char *id) {
STACKTRACE
***************
*** 526,529 ****
--- 592,597 ----
return -1;
}
+
+ /*! \brief Part of map<const char *, int> implementation, to be removed */
void GobPlayer::write_pair(const char *id, int value) {
STACKTRACE
***************
*** 534,537 ****
--- 602,611 ----
return;
}
+
+ /*! \brief Conform purch, take charge for purch upgrade
+ \param name upgrade name
+ \param price_starbucks price
+ \param price_buckazoids price
+ */
int GobPlayer::charge (char *name, int price_starbucks, int price_buckazoids) {
STACKTRACE
***************
*** 554,558 ****
}
return 0;
! }
void GobPlayer::new_ship(ShipType *type) {
STACKTRACE
--- 628,636 ----
}
return 0;
! }
!
! /*! \brief Create new ship, remove upgrades
! \param type type of new ship
! */
void GobPlayer::new_ship(ShipType *type) {
STACKTRACE
***************
*** 569,581 ****
ship = game->create_ship ( type->id, control, pos, a, team);
- /*load_ship_data(type);
- char buffy[256];
- sprintf (buffy, "./ships/%s.ini", type->id);
- gobgame->log_file(buffy);
- ship = type->getShip(x, y, a, random());
- game->add_target(ship);
-
- control->select_ship(ship, type->id);*/
-
if (panel) panel->die();
panel = NULL;
--- 647,650 ----
***************
*** 610,621 ****
}
else game->add(ship->get_ship_phaser());
- /* game->panel[index] = new ShipPanel(ship);
- game->panel[index]->locate(screen_x - PANEL_WIDTH, 0);
- game->control[index]->select_ship(ship, "Captain Kablooey");*/
- // for (i = gobgame->first_gob_enemy; i < gobgame->first_gob_enemy + gobgame->max_gob_enemies; i += 1) {
- // if (gobgame->control[i]) gobgame->control[i]->add_target(ship);
- // }
return;
}
void GobStation::buy_new_ship_menu(GobPlayer *s) {
STACKTRACE
--- 679,688 ----
}
else game->add(ship->get_ship_phaser());
return;
}
+
+ /*! \brief Check money, ask questions
+ \param s player
+ */
void GobStation::buy_new_ship_menu(GobPlayer *s) {
STACKTRACE
***************
*** 653,657 ****
return;
}
!
GobStation::GobStation ( SpaceSprite *pic, SpaceLocation *orbit_me, const char *ship, const char *background) :
Orbiter(pic, orbit_me, random() % 200 + 500)
--- 720,729 ----
return;
}
! /*! \brief Create station
! \param pic ???
! \param orbit_me ???
! \param ship ???
! \param background ???
! */
GobStation::GobStation ( SpaceSprite *pic, SpaceLocation *orbit_me, const char *ship, const char *background) :
Orbiter(pic, orbit_me, random() % 200 + 500)
***************
*** 677,680 ****
--- 749,756 ----
{ NULL, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }
};
+
+ /*! \brief Process station dialog
+ \param s Player at the station
+ */
void GobStation::station_screen(GobPlayer *s) {
STACKTRACE
***************
*** 757,760 ****
--- 833,840 ----
return;
}
+
+ /*! \brief ???
+ \param other ???
+ */
void GobStation::inflict_damage(SpaceObject *other) {
STACKTRACE
***************
*** 784,787 ****
--- 864,872 ----
int upgrade_index[999];
GobPlayer *upgrade_list_for;
+
+ /*! \brief ???
+ \param index ???
+ \param list_size ???
+ */
char *upgradeListboxGetter(int index, int *list_size) {
STACKTRACE
***************
*** 796,799 ****
--- 881,885 ----
return tmp;
}
+
#define UPGRADE_DIALOG_EXIT 0
#define UPGRADE_DIALOG_LIST 3
***************
*** 809,812 ****
--- 895,902 ----
};
+ /*! \brief show upgrade dialog
+ \param station station where player upgraded
+ \param gs Player
+ */
void GobStation::upgrade_menu(GobStation *station, GobPlayer *gs) {
STACKTRACE
***************
*** 846,849 ****
--- 936,942 ----
}
+ /*! \brief ???
+ \param ship ???
+ */
GobDefender::GobDefender ( Ship *ship)
: SpaceObject (ship, ship->normal_pos(), 0, gobgame->defenderSprite)
***************
*** 853,856 ****
--- 946,952 ----
collide_flag_anyone = 0;
}
+ /*! \brief AI for GobDefender
+ Called once per physics frame
+ */
void GobDefender::calculate() {
STACKTRACE
***************
*** 885,889 ****
return;
}
!
RainbowRift::RainbowRift ()
//: SpaceLocation ( NULL, 12800, 12800, 0)
--- 981,985 ----
return;
}
! /*! \brief ??? */
RainbowRift::RainbowRift ()
//: SpaceLocation ( NULL, 12800, 12800, 0)
***************
*** 903,906 ****
--- 999,1005 ----
next_time2 = game->game_time;
}
+ /*! \brief ???
+ \param frame ???
+ */
void RainbowRift::animate( Frame *frame ) {
STACKTRACE
***************
*** 928,931 ****
--- 1027,1031 ----
return;
}
+ /*! \brief ??? */
void RainbowRift::squiggle() {
STACKTRACE
***************
*** 953,956 ****
--- 1053,1058 ----
return;
}
+
+ /*! \brief ??? */
void RainbowRift::calculate() {
STACKTRACE
Index: ggob.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ggob.h 8 Jun 2003 17:55:49 -0000 1.3
--- ggob.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,12 ****
- #ifndef _MELEE_H
#include "../melee.h"
- #endif
- #ifndef _MFRAME_H
#include "../melee/mframe.h"
- #endif
- #ifndef _MGAME_H
#include "../melee/mgame.h"
- #endif
#include "../melee/mitems.h"
--- 1,8 ----
+ #ifndef __GGOB_H__
+ #define __GGOB_H__
#include "../melee.h"
#include "../melee/mframe.h"
#include "../melee/mgame.h"
#include "../melee/mitems.h"
***************
*** 146,148 ****
--- 142,145 ----
};
+ #endif // __GGOB_H__
Index: gmissions_objects.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/gmissions_objects.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gmissions_objects.h 26 Oct 2003 10:43:17 -0000 1.3
--- gmissions_objects.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 130,135 ****
! #endif
!
!
--- 130,133 ----
! #endif // __GMISSION_OBJECTS_H__
Index: gplexplr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gplexplr.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gplexplr.cpp 20 Oct 2003 11:00:13 -0000 1.8
--- gplexplr.cpp 10 Jan 2004 22:27:59 -0000 1.9
***************
*** 1327,1330 ****
// the game thingy should be removed, eventually.
REGISTER_GAME(gplexplr, "Planet Explorer")
-
-
--- 1327,1328 ----
Index: gplexplr.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/gplexplr.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gplexplr.h 24 Aug 2003 12:03:55 -0000 1.1
--- gplexplr.h 10 Jan 2004 22:27:59 -0000 1.2
***************
*** 180,183 ****
! #endif
--- 180,184 ----
! #endif // __GPLEXPLR_H__
!
Index: gtrug.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/gtrug.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gtrug.h 8 Jun 2003 17:55:49 -0000 1.3
--- gtrug.h 10 Jan 2004 22:27:59 -0000 1.4
***************
*** 1,2 ****
--- 1,4 ----
+ #ifndef __GTRUG_H__
+ #define __GTRUG_H__
#include "../util/t_rarray.h"
***************
*** 126,127 ****
--- 128,131 ----
TrugGUI *gui;
};
+
+ #endif // __GTRUG_H__
|
Update of /cvsroot/timewarp/source/twgui In directory sc8-pr-cvs1:/tmp/cvs-serv1655/source/twgui Modified Files: gamebuttonevent.h gametest2.h twbutton.h twbuttontypes.h twgui.cpp twgui.h twhelpers.h twmenuexamples.h twpopup.h twwindow.h utils.h Log Message: Cosmetic changes, GOB documented in doxygen style, removed redundand #ifndef directives Index: gamebuttonevent.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/gamebuttonevent.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gamebuttonevent.h 12 Dec 2003 15:58:01 -0000 1.1 --- gamebuttonevent.h 10 Jan 2004 22:27:59 -0000 1.2 *************** *** 1,5 **** ! #ifndef __GAMEBUTTONEVENT__ ! #define __GAMEBUTTONEVENT__ --- 1,5 ---- ! #ifndef __GAMEBUTTONEVENT_H__ ! #define __GAMEBUTTONEVENT_H__ *************** *** 75,77 **** ! #endif --- 75,77 ---- ! #endif // __GAMEBUTTONEVENT_H__ Index: gametest2.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/gametest2.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gametest2.h 12 Dec 2003 15:58:01 -0000 1.1 --- gametest2.h 10 Jan 2004 22:27:59 -0000 1.2 *************** *** 1,4 **** ! #ifndef __TWGUI_GAMETEST__ ! #define __TWGUI_GAMETEST__ #include "twgui.h" --- 1,4 ---- ! #ifndef __TWGUI_GAMETEST2_H__ ! #define __TWGUI_GAMETEST2_H__ #include "twgui.h" *************** *** 79,83 **** ! #endif --- 79,83 ---- ! #endif // __TWGUI_GAMETEST2_H__ Index: twbutton.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twbutton.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** twbutton.h 12 Dec 2003 15:58:01 -0000 1.1 --- twbutton.h 10 Jan 2004 22:27:59 -0000 1.2 *************** *** 1,5 **** ! #ifndef __TWBUTTON__ ! #define __TWBUTTON__ #include "utils.h" --- 1,5 ---- ! #ifndef __TWBUTTON_H__ ! #define __TWBUTTON_H__ #include "utils.h" *************** *** 161,169 **** }; ! ! ! ! ! ! ! #endif --- 161,163 ---- }; ! #endif // __TWBUTTON_H__ Index: twbuttontypes.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twbuttontypes.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** twbuttontypes.h 4 Jan 2004 22:07:00 -0000 1.6 --- twbuttontypes.h 10 Jan 2004 22:27:59 -0000 1.7 *************** *** 1,5 **** ! #ifndef __TW_BUTTONTYPES__ ! #define __TW_BUTTONTYPES__ --- 1,5 ---- ! #ifndef __TWBUTTONTYPES_H__ ! #define __TWBUTTONTYPES_H__ *************** *** 140,144 **** ! #endif --- 140,144 ---- ! #endif // __TWBUTTONTYPES_H__ Index: twgui.cpp =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twgui.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** twgui.cpp 9 Jan 2004 22:04:02 -0000 1.15 --- twgui.cpp 10 Jan 2004 22:27:59 -0000 1.16 *************** *** 19,27 **** - - - - - AreaTabletScrolled::AreaTabletScrolled(TWindow *menu, char *identbranch, int asciicode, bool akeepkey) : --- 19,22 ---- Index: twgui.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twgui.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** twgui.h 4 Jan 2004 22:07:00 -0000 1.12 --- twgui.h 10 Jan 2004 22:27:59 -0000 1.13 *************** *** 1,5 **** ! #ifndef __TWGUI_GUI__ ! #define __TWGUI_GUI__ --- 1,5 ---- ! #ifndef __TWGUI_GUI_H__ ! #define __TWGUI_GUI_H__ *************** *** 212,216 **** ! #endif --- 212,216 ---- ! #endif // __TWGUI_GUI_H__ Index: twhelpers.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twhelpers.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** twhelpers.h 4 Jan 2004 22:07:00 -0000 1.2 --- twhelpers.h 10 Jan 2004 22:27:59 -0000 1.3 *************** *** 1,5 **** ! #ifndef __TWHELPERS__ ! #define __TWHELPERS__ #include "twbuttontypes.h" --- 1,5 ---- ! #ifndef __TWHELPERS_H__ ! #define __TWHELPERS_H__ #include "twbuttontypes.h" *************** *** 85,87 **** ! #endif --- 85,87 ---- ! #endif // __TWHELPERS_H__ Index: twmenuexamples.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twmenuexamples.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** twmenuexamples.h 4 Jan 2004 22:07:00 -0000 1.2 --- twmenuexamples.h 10 Jan 2004 22:27:59 -0000 1.3 *************** *** 1,5 **** ! #ifndef __TWMENUEXAMPLES__ ! #define __TWMENUEXAMPLES__ #include "twpopup.h" --- 1,5 ---- ! #ifndef __TWMENUEXAMPLES_H__ ! #define __TWMENUEXAMPLES_H__ #include "twpopup.h" *************** *** 210,212 **** ! #endif --- 210,213 ---- ! #endif // __TWMENUEXAMPLES_H__ ! Index: twpopup.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twpopup.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** twpopup.h 4 Jan 2004 22:07:00 -0000 1.2 --- twpopup.h 10 Jan 2004 22:27:59 -0000 1.3 *************** *** 1,5 **** ! #ifndef __TWMENUCOMPONENT__ ! #define __TWMENUCOMPONENT__ /* --- 1,5 ---- ! #ifndef __TWMENUCOMPONENT_H__ ! #define __TWMENUCOMPONENT_H__ /* *************** *** 91,94 **** ! ! #endif --- 91,93 ---- ! #endif // __TWMENUCOMPONENT_H__ Index: twwindow.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/twwindow.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** twwindow.h 4 Jan 2004 22:07:00 -0000 1.5 --- twwindow.h 10 Jan 2004 22:27:59 -0000 1.6 *************** *** 1,5 **** ! #ifndef __TWINDOW__ ! #define __TWINDOW__ /* --- 1,5 ---- ! #ifndef __TWWINDOW_H__ ! #define __TWWINDOW_H__ /* *************** *** 152,156 **** ! ! ! #endif --- 152,154 ---- ! #endif // __TWWINDOW_H__ Index: utils.h =================================================================== RCS file: /cvsroot/timewarp/source/twgui/utils.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** utils.h 13 Dec 2003 14:31:56 -0000 1.7 --- utils.h 10 Jan 2004 22:27:59 -0000 1.8 *************** *** 1,5 **** ! ! #ifndef __TWGUI_UTILS__ ! #define __TWGUI_UTILS__ --- 1,4 ---- ! #ifndef __TWGUI_UTILS_H__ ! #define __TWGUI_UTILS_H__ *************** *** 116,120 **** ! #endif --- 115,119 ---- ! #endif // __TWGUI_UTILS_H__ |
|
From: <yu...@us...> - 2004-01-10 22:28:03
|
Update of /cvsroot/timewarp/source/newships
In directory sc8-pr-cvs1:/tmp/cvs-serv1655/source/newships
Modified Files:
shplyrwa.cpp
Log Message:
Cosmetic changes, GOB documented in doxygen style, removed
redundand #ifndef directives
Index: shplyrwa.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shplyrwa.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shplyrwa.cpp 15 Nov 2003 20:48:07 -0000 1.8
--- shplyrwa.cpp 10 Jan 2004 22:27:59 -0000 1.9
***************
*** 220,224 ****
void LyrmristuWaSphere::inflict_damage(SpaceObject *other) {
STACKTRACE
! int startingTargetArmour, endingTargetArmour;
int originalCrew=-1;
int originalStrength;
--- 220,224 ----
void LyrmristuWaSphere::inflict_damage(SpaceObject *other) {
STACKTRACE
! int startingTargetArmour=0, endingTargetArmour=0;
int originalCrew=-1;
int originalStrength;
|
|
From: <yu...@us...> - 2004-01-10 22:28:02
|
Update of /cvsroot/timewarp/source/gamex/general In directory sc8-pr-cvs1:/tmp/cvs-serv1655/source/gamex/general Modified Files: sprites.h Log Message: Cosmetic changes, GOB documented in doxygen style, removed redundand #ifndef directives Index: sprites.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/general/sprites.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sprites.h 5 Jan 2004 22:41:12 -0000 1.4 --- sprites.h 10 Jan 2004 22:27:59 -0000 1.5 *************** *** 28,30 **** //SpaceSprite::SpaceSprite(BITMAP **bmplist, int sprite_count, int rotations, int _attributes); ! #endif --- 28,30 ---- //SpaceSprite::SpaceSprite(BITMAP **bmplist, int sprite_count, int rotations, int _attributes); ! #endif // __GAMEX_SPRITES__ |
|
From: <yu...@us...> - 2004-01-10 22:28:02
|
Update of /cvsroot/timewarp/source/util
In directory sc8-pr-cvs1:/tmp/cvs-serv1655/source/util
Modified Files:
aastr.h base.h endian.h errors.h get_time.h history.h
net_tcp.h pmask.h random.h round.h sounds.h t_rarray.h types.h
vector2.h
Log Message:
Cosmetic changes, GOB documented in doxygen style, removed
redundand #ifndef directives
Index: aastr.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/aastr.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** aastr.h 21 Nov 2003 10:24:29 -0000 1.4
--- aastr.h 10 Jan 2004 22:27:58 -0000 1.5
***************
*** 16,25 ****
*/
-
- #include <allegro.h>
-
#ifndef __bma_aastr_h
#define __bma_aastr_h
--- 16,23 ----
*/
#ifndef __bma_aastr_h
#define __bma_aastr_h
+ #include <allegro.h>
Index: base.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/base.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** base.h 7 Jan 2004 02:58:42 -0000 1.5
--- base.h 10 Jan 2004 22:27:58 -0000 1.6
***************
*** 1,4 ****
! #ifndef _BASE_H
! #define _BASE_H
#include "types.h"
--- 1,4 ----
! #ifndef __BASE_H__
! #define __BASE_H__
#include "types.h"
***************
*** 81,83 ****
#endif
! #endif
--- 81,83 ----
#endif
! #endif // __BASE_H__
Index: endian.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/endian.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** endian.h 8 Jun 2003 17:55:56 -0000 1.3
--- endian.h 10 Jan 2004 22:27:58 -0000 1.4
***************
*** 1,4 ****
! #ifndef _TW_ENDIAN_H
! #define _TW_ENDIAN_H
int invert_ordering(int in) ;
--- 1,4 ----
! #ifndef __TW_ENDIAN_H__
! #define __TW_ENDIAN_H__
int invert_ordering(int in) ;
***************
*** 15,17 ****
#define big_endian_ordering_short motorola_ordering_short
! #endif
--- 15,17 ----
#define big_endian_ordering_short motorola_ordering_short
! #endif // __TW_ENDIAN_H__
Index: errors.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/errors.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** errors.h 25 Nov 2003 00:13:08 -0000 1.8
--- errors.h 10 Jan 2004 22:27:58 -0000 1.9
***************
*** 1,4 ****
! #ifndef _ERRORS_H
! #define _ERRORS_H
#define DO_STACKTRACE
--- 1,4 ----
! #ifndef __ERRORS_H__
! #define __ERRORS_H__
#define DO_STACKTRACE
***************
*** 149,151 ****
#endif
! #endif
--- 149,152 ----
#endif
! #endif // __ERRORS_H__
!
Index: get_time.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/get_time.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** get_time.h 8 Jun 2003 17:55:57 -0000 1.3
--- get_time.h 10 Jan 2004 22:27:58 -0000 1.4
***************
*** 1,4 ****
! #ifndef _GET_TIME_H
! #define _GET_TIME_H
#ifdef __cplusplus
--- 1,4 ----
! #ifndef __GET_TIME_H__
! #define __GET_TIME_H__
#ifdef __cplusplus
***************
*** 22,24 ****
! #endif
--- 22,25 ----
! #endif // __GET_TIME_H__
!
Index: history.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/history.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** history.h 8 Jun 2003 17:55:57 -0000 1.3
--- history.h 10 Jan 2004 22:27:58 -0000 1.4
***************
*** 1,8 ****
! #ifndef _HISTORY_H
! #define _HISTORY_H
- #ifndef _TYPES_H
#include "types.h"
! #endif
/*
--- 1,7 ----
! #ifndef __HISTORY_H__
! #define __HISTORY_H__
#include "types.h"
!
/*
***************
*** 62,64 ****
};
! #endif
--- 61,63 ----
};
! #endif // __HISTORY_H__
Index: net_tcp.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/net_tcp.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** net_tcp.h 8 Jun 2003 17:55:57 -0000 1.3
--- net_tcp.h 10 Jan 2004 22:27:58 -0000 1.4
***************
*** 1,5 ****
! #ifndef _NET_TCP_H
! #define _NET_TCP_H
class NetTCP {
--- 1,5 ----
! #ifndef __NET_TCP_H__
! #define __NET_TCP_H__
class NetTCP {
***************
*** 39,41 ****
! #endif
--- 39,41 ----
! #endif // __NET_TCP_H__
Index: pmask.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/pmask.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pmask.h 8 Jun 2003 17:55:57 -0000 1.3
--- pmask.h 10 Jan 2004 22:27:58 -0000 1.4
***************
*** 1,4 ****
! #ifndef pmask_H
! #define pmask_H
/*
--- 1,4 ----
! #ifndef __PMASK_H__
! #define __PMASK_H__
/*
***************
*** 185,188 ****
! #endif /* ifndef PPCOL_H */
--- 185,188 ----
! #endif // __PMASK_H__
Index: random.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/random.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** random.h 25 Oct 2003 02:35:52 -0000 1.4
--- random.h 10 Jan 2004 22:27:58 -0000 1.5
***************
*** 3,8 ****
#endif
! #ifndef __RANDOM_H
! #define __RANDOM_H
--- 3,8 ----
#endif
! #ifndef __RANDOM_H__
! #define __RANDOM_H__
***************
*** 66,70 ****
!
!
! #endif
--- 66,68 ----
! #endif // __RANDOM_H__
Index: round.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/round.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** round.h 8 Jun 2003 17:55:57 -0000 1.3
--- round.h 10 Jan 2004 22:27:58 -0000 1.4
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef __TWROUND_H__
+ #define __TWROUND_H__
+
#ifdef __cplusplus
extern "C" {
***************
*** 8,9 ****
--- 11,14 ----
}
#endif
+
+ #endif // __TWROUND_H__
Index: sounds.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/sounds.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sounds.h 8 Jun 2003 17:55:57 -0000 1.3
--- sounds.h 10 Jan 2004 22:27:58 -0000 1.4
***************
*** 1,4 ****
! #ifndef _SOUNDS_H
! #define _SOUNDS_H
#define PLATFORM_IS_ALLEGRO
--- 1,4 ----
! #ifndef __SOUNDS_H__
! #define __SOUNDS_H__
#define PLATFORM_IS_ALLEGRO
***************
*** 54,56 ****
extern tw_soundsystem;
#define sound tw_soundsystem
! #endif
--- 54,57 ----
extern tw_soundsystem;
#define sound tw_soundsystem
!
! #endif // __SOUNDS_H__
Index: t_rarray.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/t_rarray.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** t_rarray.h 8 Jun 2003 17:55:57 -0000 1.3
--- t_rarray.h 10 Jan 2004 22:27:58 -0000 1.4
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef __T_RARRAY_H__
+ #define __T_RARRAY_H__
+
template <class Type, int extra = 0>
class R_Array {
***************
*** 48,49 ****
--- 51,53 ----
};
+ #endif // __T_RARRAY_H__
Index: types.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/types.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** types.h 8 Jun 2003 17:55:58 -0000 1.3
--- types.h 10 Jan 2004 22:27:58 -0000 1.4
***************
*** 1,4 ****
! #ifndef _TYPES_H
! #define _TYPES_H
#if 0
--- 1,4 ----
! #ifndef __TYPES_H__
! #define __TYPES_H__
#if 0
***************
*** 55,57 ****
#endif
! #endif
--- 55,58 ----
#endif
!
! #endif // __TYPES_H__
Index: vector2.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/vector2.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** vector2.h 26 Oct 2003 10:43:18 -0000 1.6
--- vector2.h 10 Jan 2004 22:27:58 -0000 1.7
***************
*** 1,4 ****
! #ifndef _VECTOR2_H
! #define _VECTOR2_H
class Vector2;
--- 1,4 ----
! #ifndef __VECTOR2_H__
! #define __VECTOR2_H__
class Vector2;
***************
*** 173,178 ****
};
!
!
!
! #endif
--- 173,175 ----
};
! #endif // __VECTOR2_H__
|
|
From: <yu...@us...> - 2004-01-10 22:28:02
|
Update of /cvsroot/timewarp/source/gamex In directory sc8-pr-cvs1:/tmp/cvs-serv1655/source/gamex Modified Files: ai_fleet.h ai_race.h gamedata.h gamedialogue.h gamegeneral.h gamehyper.h gameplanetmission.h gameplanetscan.h gameplanetview.h gameproject.h gamesolarview.h gamestarmap.h projectx.h Log Message: Cosmetic changes, GOB documented in doxygen style, removed redundand #ifndef directives Index: ai_fleet.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/ai_fleet.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ai_fleet.h 22 Dec 2003 12:03:17 -0000 1.2 --- ai_fleet.h 10 Jan 2004 22:27:58 -0000 1.3 *************** *** 35,39 **** ! #endif --- 35,39 ---- ! #endif // __GAMEX_FLEETAI__ Index: ai_race.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/ai_race.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ai_race.h 18 Nov 2003 17:18:47 -0000 1.1.1.1 --- ai_race.h 10 Jan 2004 22:27:58 -0000 1.2 *************** *** 13,17 **** ! #endif --- 13,17 ---- ! #endif //__GAMEX_FLEETAI__ Index: gamedata.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamedata.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gamedata.h 10 Jan 2004 14:11:53 -0000 1.8 --- gamedata.h 10 Jan 2004 22:27:58 -0000 1.9 *************** *** 253,257 **** extern IndexTypeList *starsurfacetypelist; ! #endif --- 253,257 ---- extern IndexTypeList *starsurfacetypelist; ! #endif // __GAMEX_DATA__ Index: gamedialogue.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamedialogue.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gamedialogue.h 4 Jan 2004 22:06:59 -0000 1.4 --- gamedialogue.h 10 Jan 2004 22:27:58 -0000 1.5 *************** *** 53,57 **** ! #endif --- 53,57 ---- ! #endif // __GAMEX_DIALOGUE__ Index: gamegeneral.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamegeneral.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gamegeneral.h 4 Jan 2004 22:06:59 -0000 1.4 --- gamegeneral.h 10 Jan 2004 22:27:58 -0000 1.5 *************** *** 123,127 **** ! #endif --- 123,127 ---- ! #endif // __GAMEX_GENERAL__ Index: gamehyper.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamehyper.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gamehyper.h 10 Jan 2004 14:11:53 -0000 1.6 --- gamehyper.h 10 Jan 2004 22:27:58 -0000 1.7 *************** *** 95,99 **** ! #endif --- 95,99 ---- ! #endif // __GAMEX_HYPER__ Index: gameplanetmission.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gameplanetmission.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** gameplanetmission.h 18 Nov 2003 17:18:49 -0000 1.1.1.1 --- gameplanetmission.h 10 Jan 2004 22:27:58 -0000 1.2 *************** *** 151,156 **** ! #endif ! #endif --- 151,156 ---- ! #endif // __GAME_PLANET_VIEW__ ! #endif // NOTDEFINED Index: gameplanetscan.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gameplanetscan.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gameplanetscan.h 4 Jan 2004 22:07:00 -0000 1.3 --- gameplanetscan.h 10 Jan 2004 22:27:58 -0000 1.4 *************** *** 57,60 **** ! #endif --- 57,60 ---- ! #endif // __GAMEX_PLANET_SCAN__ Index: gameplanetview.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gameplanetview.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gameplanetview.h 5 Jan 2004 22:41:12 -0000 1.7 --- gameplanetview.h 10 Jan 2004 22:27:58 -0000 1.8 *************** *** 111,114 **** ! #endif --- 111,114 ---- ! #endif // __GAMEX_PLANET_VIEW__ Index: gameproject.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gameproject.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gameproject.h 22 Dec 2003 12:03:17 -0000 1.8 --- gameproject.h 10 Jan 2004 22:27:58 -0000 1.9 *************** *** 163,167 **** ! #endif --- 163,167 ---- ! #endif // __GAME_PROJECT__ Index: gamesolarview.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamesolarview.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gamesolarview.h 10 Jan 2004 14:11:53 -0000 1.6 --- gamesolarview.h 10 Jan 2004 22:27:58 -0000 1.7 *************** *** 109,111 **** ! #endif --- 109,111 ---- ! #endif // __GAMEX_SOLAR_VIEW__ Index: gamestarmap.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamestarmap.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gamestarmap.h 10 Jan 2004 14:11:53 -0000 1.7 --- gamestarmap.h 10 Jan 2004 22:27:58 -0000 1.8 *************** *** 90,94 **** ! #endif --- 90,94 ---- ! #endif // __GAMEX_STARMAP__ Index: projectx.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/projectx.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** projectx.h 18 Nov 2003 17:18:50 -0000 1.1.1.1 --- projectx.h 10 Jan 2004 22:27:58 -0000 1.2 *************** *** 25,29 **** ! #endif --- 25,29 ---- ! #endif // __GAME_MAIN__ |
|
From: <yu...@us...> - 2004-01-10 22:28:02
|
Update of /cvsroot/timewarp/source
In directory sc8-pr-cvs1:/tmp/cvs-serv1655/source
Modified Files:
ais.h frame.cpp frame.h id.h melee.h scp.cpp scp.h ship.h
Log Message:
Cosmetic changes, GOB documented in doxygen style, removed
redundand #ifndef directives
Index: ais.h
===================================================================
RCS file: /cvsroot/timewarp/source/ais.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ais.h 13 Dec 2003 14:32:23 -0000 1.5
--- ais.h 10 Jan 2004 22:27:58 -0000 1.6
***************
*** 1,14 ****
! #ifndef _MCONTROL_H
#include "melee/mcontrol.h"
- #endif
- #ifndef _MSHIP_H
#include "melee/mship.h"
- #endif
- #ifndef _MGAME_H
#include "melee/mgame.h"
- #endif
-
- #ifndef _AIS_H
- #define _AIS_H
#define MAX_STATES 3
--- 1,9 ----
!
! #ifndef __AIS_H__
! #define __AIS_H__
!
#include "melee/mcontrol.h"
#include "melee/mship.h"
#include "melee/mgame.h"
#define MAX_STATES 3
***************
*** 16,19 ****
--- 11,15 ----
//ais/c_input.cpp
+ /*! \brief Human Ship Control */
class ControlHuman : public Control {
private:
***************
*** 40,43 ****
--- 36,41 ----
//ais/c_other.cpp
int stupid_bot(Ship *ship) ;
+
+ /*! \brief AI with no brain */
class ControlVegetable : public Control {
public:
***************
*** 47,50 ****
--- 45,50 ----
ControlVegetable (const char *name, int channel) ;
};
+
+ /*! \brief Simple AI */
class ControlMoron : public Control {
public:
***************
*** 57,60 ****
--- 57,61 ----
//ais/c_wussie.cpp
+ /*! \brief Complex AI */
class ControlWussie : public Control {
public:
***************
*** 92,95 ****
--- 93,97 ----
};
+ /*! \brief ??? */
class KeyState {
public:
***************
*** 102,104 ****
};
! #endif
--- 104,107 ----
};
! #endif // __AIS_H__
!
Index: frame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/frame.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** frame.cpp 11 Dec 2003 23:41:14 -0000 1.7
--- frame.cpp 10 Jan 2004 22:27:58 -0000 1.8
***************
*** 14,17 ****
--- 14,22 ----
int BACKGROUND_COLOR = 0;
+ /*! \brief compare DirtyItems
+ \param p1 first item
+ \param p2 second item
+ \return 0 if equal, >0 if first > second, <0 if first < second
+ */
int item_cmp(const void* p1, const void* p2)
{
***************
*** 19,22 ****
--- 24,28 ----
}
+ /*! \brief set pixel color to BACKGROUND_COLOR */
void erase_pixel(DirtyItem *item, BITMAP *frame)
{
***************
*** 24,27 ****
--- 30,34 ----
}
+ /*! \brief Draw pixel to child from frame */
void draw_pixel(DirtyItem *item, BITMAP *frame, BITMAP *child)
{
***************
*** 29,32 ****
--- 36,40 ----
}
+ /*! \brief set item color to BACKGROUND_COLOR */
void erase_box(DirtyItem *item, BITMAP *frame)
{
***************
*** 34,37 ****
--- 42,46 ----
}
+ /*! \brief copy item to chield */
void draw_box(DirtyItem *item, BITMAP *frame, BITMAP *child)
{
***************
*** 49,52 ****
--- 58,62 ----
}
+ /*! \brief Set line color to BACKGROUND_COLOR */
void erase_line(DirtyItem *item, BITMAP *frame)
{
***************
*** 59,62 ****
--- 69,73 ----
static BITMAP *line_frame;
+ /*! \brief Draw line on line_child, this function use global variable line_frame to detect color */
void line_pixel(BITMAP *line_child, int x, int y, int d)
{
***************
*** 64,67 ****
--- 75,79 ----
}
+ /*! \brief Set pixel color to BACKGROUND_COLOR */
void erase_a_pixel(BITMAP *child, int x, int y, int d)
{
***************
*** 69,72 ****
--- 81,85 ----
}
+ /*! \brief Set circele color to BACKGROUND_COLOR */
void erase_circle(DirtyItem *item, BITMAP *frame)
{
***************
*** 74,77 ****
--- 87,91 ----
}
+ /*! \brief Draw circle from Item */
void draw_circle(DirtyItem *item, BITMAP *frame, BITMAP *child)
{
***************
*** 80,83 ****
--- 94,98 ----
}
+ /*! \brief Draw line from Item */
void draw_line(DirtyItem *item, BITMAP *frame, BITMAP *child)
{
***************
*** 120,123 ****
--- 135,139 ----
}
+ /*! \brief Used for define new BACKGROUND_COLOR */
void Frame::set_background ( int r, int g, int b) {
background_red = r;
***************
*** 127,130 ****
--- 143,147 ----
}
+ /*! \brief weild code to enlarge amount of items */
void Frame::enlarge_list(int increment) {
***************
*** 145,148 ****
--- 162,166 ----
}
+ /*! \brief add item to item list */
void Frame::add_to_list(int x, int y, int a, int b,
void (*erase_item)(DirtyItem *item, BITMAP *frame),
***************
*** 163,166 ****
--- 181,185 ----
}
+ /*! \brief strange function to be deleted I think */
void Frame::add_to_old_list(int x, int y, int a, int b,
void (*erase_item)(DirtyItem *item, BITMAP *frame),
***************
*** 181,184 ****
--- 200,204 ----
}
+ /*! \brief Add pixel item to item list */
void Frame::add_pixel(int x, int y)
{
***************
*** 186,189 ****
--- 206,210 ----
}
+ /*! \brief Add box item to item list */
void Frame::add_box(double x, double y, double w, double h)
{
***************
*** 191,195 ****
}
!
void Frame::add_circle(int x, int y, int a, int b)
{
--- 212,216 ----
}
! /*! \brief Add circle item to item list */
void Frame::add_circle(int x, int y, int a, int b)
{
***************
*** 197,200 ****
--- 218,222 ----
}
+ /*! \brief to be deleted? */
void Frame::add_old_circle(int x, int y, int a, int b)
{
***************
*** 202,205 ****
--- 224,228 ----
}
+ /*! \brief to be deleted? */
void Frame::add_line(int x, int y, int a, int b)
{
***************
*** 207,210 ****
--- 230,234 ----
}
+ /*! \brief to be deleted? */
void Frame::add_old_pixel(int x, int y)
{
***************
*** 212,215 ****
--- 236,240 ----
}
+ /*! \brief to be deleted? */
void Frame::add_old_box(int x, int y, int a, int b)
{
***************
*** 223,226 ****
--- 248,252 ----
}
+ /*! \brief to be deleted? */
void Frame::add_old_line(int x, int y, int a, int b)
{
***************
*** 228,231 ****
--- 254,258 ----
}
+ /*! \brief Clear screen, copy items to old items, destroy items */
void Frame::erase()
{
***************
*** 273,284 ****
}
- /* item_count = 0;
- drawn_items = 0;
- old_item_count = 0;
- full_redraw = true;*/
-
return;
}
void Frame::prepare () {
STACKTRACE
--- 300,307 ----
}
return;
}
+ /*! \brief Clear surface and set width and heigth to window w, h */
void Frame::prepare () {
STACKTRACE
***************
*** 303,306 ****
--- 326,330 ----
}
+ /*! \brief Draw frame */
void Frame::draw()
{
Index: frame.h
===================================================================
RCS file: /cvsroot/timewarp/source/frame.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** frame.h 11 Oct 2003 21:00:59 -0000 1.4
--- frame.h 10 Jan 2004 22:27:58 -0000 1.5
***************
*** 1,4 ****
! #ifndef _FRAME_H
! #define _FRAME_H
typedef struct DirtyItem {
--- 1,4 ----
! #ifndef __FRAME_H__
! #define __FRAME_H__
typedef struct DirtyItem {
***************
*** 18,21 ****
--- 18,22 ----
void draw_line(DirtyItem *item, BITMAP *frame, BITMAP *child);
+ /*! \brief ??? */
class Frame {
public:
***************
*** 44,51 ****
void add_to_list(int x, int y, int a, int b,
void (*erase_item)(DirtyItem *item, BITMAP *frame),
! void (*draw_item)(DirtyItem *item, BITMAP *frame, BITMAP *child));
void add_to_old_list(int x, int y, int a, int b,
! void (*erase_item)(DirtyItem *item, BITMAP *frame),
! void (*draw_item)(DirtyItem *item, BITMAP *frame, BITMAP *child));
void add_pixel(int x, int y);
--- 45,55 ----
void add_to_list(int x, int y, int a, int b,
void (*erase_item)(DirtyItem *item, BITMAP *frame),
! void (*draw_item)(DirtyItem *item,
! BITMAP *frame, BITMAP *child));
void add_to_old_list(int x, int y, int a, int b,
! void (*erase_item)(DirtyItem *item,
! BITMAP *frame),
! void (*draw_item)(DirtyItem *item,
! BITMAP *frame, BITMAP *child));
void add_pixel(int x, int y);
***************
*** 68,70 ****
};
! #endif
--- 72,74 ----
};
! #endif // __FRAME_H__
Index: id.h
===================================================================
RCS file: /cvsroot/timewarp/source/id.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** id.h 8 Jun 2003 17:55:47 -0000 1.3
--- id.h 10 Jan 2004 22:27:58 -0000 1.4
***************
*** 1,4 ****
! #ifndef _ID_H
! #define _ID_H
#define SPACE_LOCATION 0x00000000
--- 1,4 ----
! #ifndef __ID_H__
! #define __ID_H__
#define SPACE_LOCATION 0x00000000
***************
*** 87,89 ****
! #endif
--- 87,90 ----
! #endif // __ID_H__
!
Index: melee.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** melee.h 11 Dec 2003 02:25:43 -0000 1.11
--- melee.h 10 Jan 2004 22:27:58 -0000 1.12
***************
*** 1,4 ****
! #ifndef _MELEE_H
! #define _MELEE_H
#include <stdlib.h>
--- 1,4 ----
! #ifndef __MELEE_H__
! #define __MELEE_H__
#include <stdlib.h>
***************
*** 318,321 ****
--- 318,322 ----
virtual int _get_size() const {return sizeof(*this);}
};
+
class VideoSystem : public BaseClass {
public:
***************
*** 340,343 ****
--- 341,345 ----
void redraw();
} extern videosystem;
+
int get_gamma();
void set_gamma(int gamma);
***************
*** 635,637 ****
int d_tw_yield_proc(int msg, DIALOG *d, int c);
! #endif
--- 637,639 ----
int d_tw_yield_proc(int msg, DIALOG *d, int c);
! #endif // __MELEE_H__
Index: scp.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/scp.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** scp.cpp 10 Jan 2004 14:32:19 -0000 1.32
--- scp.cpp 10 Jan 2004 22:27:58 -0000 1.33
***************
*** 77,149 ****
FILE *debug_file;
! /*
! * void showTitle(VideoWindow *window)
! *
! * Blits GUI background bitmap on to a video window.
! */
void showTitle(VideoWindow *window = &videosystem.window);
! /*
! * extended_menu(int i);
! *
! * MELEE_EX dialog - selects alternate games as opposed to standard melee. From here you
! * can access diagnostics (DIAGNOSTICS dialog) and ship info. (SHIPVIEW dialog) You can
! * also test key jamming from this dialog.
*/
void extended_menu(int i = -1);
! /*
! * void change_teams();
! *
! * TEAMS dialog - from here you can select controllers for each player, and access
! * their respective fleets. (FLEET dialog)
*/
void change_teams();
! /*
! * edit_fleet(int player);
! *
! * FLEET dialog - manages fleet compositions for an individual player.
! *
! *
! * PARAMETERS
! *
! * int player
! * Player index indicating which player's fleet to edit.
*/
void edit_fleet(int player);
! /*
! * ship_view_dialog(int si, Fleet *Fleet);
! *
! * SHIPVIEW dialog - displays statistics and text information (if available) about
! * the currently installed ships.
! *
! *
! * PARAMETERS
! *
! * int si
! * Ship index. By default 0, the first ship in the fleet.
! *
! * Fleet *fleet
! * Pointer to a fleet upon which the ship list is built. When this parameter
! * is set to the default value NULL, the reference fleet is used to build
! * the ship list.
! */
//void ship_view_dialog(int si = 0, Fleet *fleet = NULL);
! /*
! * show_diagnostics();
! *
! * DIAGNOSTICS dialog - displays version number and platform data.
! */
void show_diagnostics();
! /*
! * void keyjamming_tester();
! *
! * Opens a screen showing which keys are currently pressed. Here the user may test
! * various key combinations for conflicts.
! */
void keyjamming_tester();
--- 77,110 ----
FILE *debug_file;
! /*! \brief Blits GUI background bitmap on to a video window */
void showTitle(VideoWindow *window = &videosystem.window);
! /*! \brief MELEE_EX dialog - selects alternate games as opposed to standard melee.
! From here you can access diagnostics (DIAGNOSTICS dialog) and ship info.
! (SHIPVIEW dialog) You can also test key jamming from this dialog.
*/
void extended_menu(int i = -1);
! /*! \brief TEAMS dialog - from here you can select controllers for each player, and access their respective fleets. (FLEET dialog)
*/
void change_teams();
! /*! \brief FLEET dialog - manages fleet compositions for an individual player.
! \param player Player index indicating which player's fleet to edit.
*/
void edit_fleet(int player);
! /*! \brief SHIPVIEW dialog - displays statistics and text information (if available) about the currently installed ships.
! \param si Ship index. By default 0, the first ship in the fleet.
! \param fleet Pointer to a fleet upon which the ship list is built. When
! this parameter is set to the default value NULL, the reference fleet is
! used to build the ship list.
! */
//void ship_view_dialog(int si = 0, Fleet *fleet = NULL);
! /*! \brief DIAGNOSTICS dialog - displays version number and platform data */
void show_diagnostics();
! /*! \brief Opens a screen showing which keys are currently pressed. Here the user may test various key combinations for conflicts. */
void keyjamming_tester();
Index: scp.h
===================================================================
RCS file: /cvsroot/timewarp/source/scp.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** scp.h 21 Nov 2003 10:24:28 -0000 1.5
--- scp.h 10 Jan 2004 22:27:58 -0000 1.6
***************
*** 1,4 ****
! #ifndef _SCP_H
! #define _SCP_H
const char *tw_version();
--- 1,4 ----
! #ifndef __SCP_H__
! #define __SCP_H__
const char *tw_version();
***************
*** 11,13 ****
void ship_view_dialog(int si = 0, class Fleet *fleet = NULL);
! #endif
--- 11,13 ----
void ship_view_dialog(int si = 0, class Fleet *fleet = NULL);
! #endif // __SCP_H__
Index: ship.h
===================================================================
RCS file: /cvsroot/timewarp/source/ship.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ship.h 8 Jun 2003 17:55:48 -0000 1.3
--- ship.h 10 Jan 2004 22:27:58 -0000 1.4
***************
*** 1,22 ****
#include <allegro.h>
! #ifndef _MELEE_H
#include "melee.h"
- #endif
- #ifndef _MGAME_H
#include "melee/mgame.h"
- #endif
- #ifndef _MCONTROL_H
#include "melee/mcontrol.h"
- #endif
- #ifndef _MSHIP_H
#include "melee/mship.h"
- #endif
- #ifndef _MSHOT_H
#include "melee/mshot.h"
- #endif
- #ifndef _MANIM_H
#include "melee/manim.h"
- #endif
- #ifndef _ID_H
#include "id.h"
! #endif
--- 1,14 ----
+ #ifndef __SHIP_H__
+ #define __SHIP_H__
+
#include <allegro.h>
!
#include "melee.h"
#include "melee/mgame.h"
#include "melee/mcontrol.h"
#include "melee/mship.h"
#include "melee/mshot.h"
#include "melee/manim.h"
#include "id.h"
!
! #endif // __SHIP_H__
|
|
From: <yu...@us...> - 2004-01-10 22:28:02
|
Update of /cvsroot/timewarp/source/gamex/edit In directory sc8-pr-cvs1:/tmp/cvs-serv1655/source/gamex/edit Modified Files: disk_stuff.h edit_dialogue.h Log Message: Cosmetic changes, GOB documented in doxygen style, removed redundand #ifndef directives Index: disk_stuff.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/edit/disk_stuff.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** disk_stuff.h 18 Nov 2003 17:18:50 -0000 1.1.1.1 --- disk_stuff.h 10 Jan 2004 22:27:59 -0000 1.2 *************** *** 100,104 **** ! #endif --- 100,104 ---- ! #endif // __GAMEX_DISK_STUFF__ Index: edit_dialogue.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/edit/edit_dialogue.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** edit_dialogue.h 4 Jan 2004 22:07:00 -0000 1.4 --- edit_dialogue.h 10 Jan 2004 22:27:59 -0000 1.5 *************** *** 102,106 **** ! #endif --- 102,106 ---- ! #endif // __GAMEX_EDIT_DIALOGUE__ |
|
From: <yu...@us...> - 2004-01-10 22:28:02
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1:/tmp/cvs-serv1655 Modified Files: client.ini Log Message: Cosmetic changes, GOB documented in doxygen style, removed redundand #ifndef directives |
|
From: <yu...@us...> - 2004-01-10 22:28:02
|
Update of /cvsroot/timewarp/source/ais
In directory sc8-pr-cvs1:/tmp/cvs-serv1655/source/ais
Modified Files:
c_input.cpp c_other.cpp c_wussie.cpp
Log Message:
Cosmetic changes, GOB documented in doxygen style, removed
redundand #ifndef directives
Index: c_input.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/ais/c_input.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** c_input.cpp 13 Dec 2003 14:29:56 -0000 1.5
--- c_input.cpp 10 Jan 2004 22:27:58 -0000 1.6
***************
*** 7,13 ****
*
*
! * - ControlHuman::setup() function modified. setup_key_description() is now redundant
! * due to modifications in key_to_description(). There was also a duplication of
! * closest target setting.
* - JOY dialog structure and function modified. Should work O.K. now.
* - Cosmetic code changes.
--- 7,13 ----
*
*
! * - ControlHuman::setup() function modified. setup_key_description()
! * is now redundant due to modifications in key_to_description(). There
! * was also a duplication of closest target setting.
* - JOY dialog structure and function modified. Should work O.K. now.
* - Cosmetic code changes.
***************
*** 104,107 ****
--- 104,111 ----
}
+ /*! \brief load players keys
+ \param inifile with players keys
+ \param inisection with players keys
+ */
void ControlHuman::load (const char *inifile, const char *inisection) {
set_config_file (inifile);
***************
*** 124,128 ****
return;
}
!
void ControlHuman::save (const char *inifile, const char *inisection) {
set_config_file (inifile);
--- 128,135 ----
return;
}
! /*! \brief Save players key
! \param inifile with players keys
! \param inisection with players keys
! */
void ControlHuman::save (const char *inifile, const char *inisection) {
set_config_file (inifile);
***************
*** 146,153 ****
--- 153,162 ----
}
+ /*! \brief Get control name */
const char *ControlHuman::getTypeName() {
return "Keyboard/Joystick";
}
+ /*! \brief Process get input from player */
int ControlHuman::think() {
int r = 0;
***************
*** 206,209 ****
--- 215,219 ----
};
+ /*! \brief setap players keys */
void ControlHuman::setup() {
int i, t = 0;
Index: c_other.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/ais/c_other.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** c_other.cpp 20 Oct 2003 11:00:06 -0000 1.5
--- c_other.cpp 10 Jan 2004 22:27:58 -0000 1.6
***************
*** 2,14 ****
--- 2,20 ----
REGISTER_FILE
+ /*! \brief Get control name */
const char *ControlVegetable::getTypeName() {
return "VegetableBot";
}
+ /*! \brief This AI do nothing */
int ControlVegetable::think() {
return 0;
}
+ /*! \brief This function do nothing
+ \return -1
+ */
int ControlVegetable::choose_ship(VideoWindow *window, char * prompt, class Fleet *fleet ) {
return -1;
}
+
ControlVegetable::ControlVegetable (const char *name, int channel) : Control(name, channel) {
}
***************
*** 17,20 ****
--- 23,30 ----
return "MoronBot";
}
+
+ /*! \brief Simple AI
+ \param ship with this stupid AI
+ */
int stupid_bot(Ship *ship) {
STACKTRACE
***************
*** 46,52 ****
--- 56,65 ----
return r;
}
+
+ /*! \brief Summon stupid_bot() */
int ControlMoron::think() {
return stupid_bot(ship);
}
+
ControlMoron::ControlMoron(const char *name, int channel) : Control(name, channel) {}
Index: c_wussie.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/ais/c_wussie.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** c_wussie.cpp 22 Dec 2003 12:03:17 -0000 1.8
--- c_wussie.cpp 10 Jan 2004 22:27:58 -0000 1.9
***************
*** 45,48 ****
--- 45,51 ----
#define TACTIC_RANGE 4
+ /*! \brief Check danger
+ \return Max damage ship can get from his enemies
+ */
double ControlWussie::check_danger ()
{
***************
*** 78,81 ****
--- 81,85 ----
}
+ /*! \brief Get control name */
const char *ControlWussie::getTypeName ()
{
***************
*** 83,94 ****
}
- int absf (double x)
- {
- if (x >= 0)
- return ((int) x);
- else
- return ((int) (-1 * x));
- }
-
double ControlWussie::evasion (Ship * ship)
{
--- 87,90 ----
***************
*** 151,160 ****
distance_from (normalize2(Vector2(xs, ys), map_size), shot_pos)
/ velshot;
! if (absf (shottime - shiptime) < closetime)
{
angle =
ship->get_angle () -
ship->trajectory_angle (shot);
! closetime = absf (shottime - shiptime);
if ((angle < PI/12) || (angle > PI2-PI/12))
angle += PI;
--- 147,156 ----
distance_from (normalize2(Vector2(xs, ys), map_size), shot_pos)
/ velshot;
! if (fabs (shottime - shiptime) < closetime)
{
angle =
ship->get_angle () -
ship->trajectory_angle (shot);
! closetime = fabs (shottime - shiptime);
if ((angle < PI/12) || (angle > PI2-PI/12))
angle += PI;
***************
*** 195,199 ****
pangle = ship->trajectory_angle (p);
va = atan (ship->get_vel ());
! if (absf (pangle - va) < PI/3)
{
avoid_planet = TRUE;
--- 191,195 ----
pangle = ship->trajectory_angle (p);
va = atan (ship->get_vel ());
! if (fabs (pangle - va) < PI/3)
{
avoid_planet = TRUE;
***************
*** 358,362 ****
{
if ((distance < option_range[state][j])
! && (absf (angle) < sweep[j]))
fireoption[0] = TRUE;
}
--- 354,358 ----
{
if ((distance < option_range[state][j])
! && (fabs (angle) < sweep[j]))
fireoption[0] = TRUE;
}
***************
*** 376,380 ****
case OPTION_BACK:
! if (absf (angle) > (PI - sweep[j]))
fireoption[j] = TRUE;
field_fire = FALSE;
--- 372,376 ----
case OPTION_BACK:
! if (fabs (angle) > (PI - sweep[j]))
fireoption[j] = TRUE;
field_fire = FALSE;
***************
*** 382,387 ****
case OPTION_SIDES:
! if ((absf (angle) < PI/2 + sweep[j])
! && (absf (angle) > PI/2 - sweep[j]))
fireoption[j] = TRUE;
field_fire = FALSE;
--- 378,383 ----
case OPTION_SIDES:
! if ((fabs (angle) < PI/2 + sweep[j])
! && (fabs (angle) > PI/2 - sweep[j]))
fireoption[j] = TRUE;
field_fire = FALSE;
***************
*** 415,419 ****
case OPTION_MINE:
a = atan(ship->target->get_vel ());
! if (absf
(normalize
(ship->target->trajectory_angle (ship) + PI/2,
--- 411,415 ----
case OPTION_MINE:
a = atan(ship->target->get_vel ());
! if (fabs
(normalize
(ship->target->trajectory_angle (ship) + PI/2,
***************
*** 482,486 ****
if (fire_front)
! if (absf (angle) < sweep[j])
fireoption[j] = TRUE;
--- 478,482 ----
if (fire_front)
! if (fabs (angle) < sweep[j])
fireoption[j] = TRUE;
|
|
From: <yu...@us...> - 2004-01-10 22:28:01
|
Update of /cvsroot/timewarp/source/gamex/stuff In directory sc8-pr-cvs1:/tmp/cvs-serv1655/source/gamex/stuff Modified Files: backgr_stars.h space_body.h Log Message: Cosmetic changes, GOB documented in doxygen style, removed redundand #ifndef directives Index: backgr_stars.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/stuff/backgr_stars.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** backgr_stars.h 18 Nov 2003 17:18:52 -0000 1.1.1.1 --- backgr_stars.h 10 Jan 2004 22:27:58 -0000 1.2 *************** *** 22,24 **** ! #endif --- 22,24 ---- ! #endif // __GAMEX_BACKGR_STARS__ Index: space_body.h =================================================================== RCS file: /cvsroot/timewarp/source/gamex/stuff/space_body.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** space_body.h 10 Jan 2004 14:11:53 -0000 1.5 --- space_body.h 10 Jan 2004 22:27:58 -0000 1.6 *************** *** 147,149 **** ! #endif --- 147,150 ---- ! #endif // __GAMEX_SPACE_BODY__ ! |
|
From: <you...@us...> - 2004-01-10 20:26:37
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1:/tmp/cvs-serv2054 Modified Files: twwin.dsp Log Message: adding a test Lua game type... probably not the best approach for the long run, but it's an experiment |
5 messages has been excluded from this view by a project administrator.
