timewarp-commit — Shows each and every CVS commit - high volume

[Timewarp-commit] source/newships shpaktgu.cpp,1.2,1.3 shpalabc.cpp,1.13,1.14 shpalckr.cpp,1.10,1.11 shpalhdr.cpp,1.10,1.11 shparitr.cpp,1.11,1.12 shparkpi.cpp,1.10,1.11 shpartem.cpp,1.9,1.10 shpayrbs.cpp,1.17,1.18 shpbahbu.cpp,1.2,1.3 shpbatde.cpp,1.15,1.16 shpbipka.cpp,1.11,1.12 shpbogce.cpp,1.2,1.3 shpbubbo.cpp,1.15,1.16 shpbubex.cpp,1.8,1.9 shpchoex.cpp,1.9,1.10 shpclofl.cpp,1.10,1.11 shpconca.cpp,1.12,1.13 shpconho.cpp,1.9,1.10 shpcrapl.cpp,1.6,1.7 shpcresu.cpp,1.8,1.9 shpdajem.cpp,1.9,1.10 shpdeees.cpp,1.2,1.3 shpdjila.cpp,1.7,1.8 shpdragr.cpp,1.6,1.7 shpducla.cpp,1.12,1.13 shpdyzha.cpp,1.10,1.11 shpearc2.cpp,1.6,1.7 shpearc3.cpp,1.12,1.13 shpestgu.cpp,1.11,1.12 shpfiear.cpp,1.8,1.9 shpfopsl.cpp,1.6,1.7 shpforsh.cpp,1.8,1.9 shpfresc.cpp,1.7,1.8 shpgahmo.cpp,1.4,1.5 shpgarty.cpp,1.9,1.10 shpgerhe.cpp,1.15,1.16 shpglacr.cpp,1.7,1.8 shpglads.cpp,1.6,1.7 shphotsp.cpp,1.10,1.11 shphubde.cpp,1.5,1.6 shphydcr.cpp,1.8,1.9 shpiceco.cpp,1.9,1.10 shpilwsp.cpp,1.9,1.10 shpimpka.cpp,1.10,1.11 shpjnkla.cpp,1.11,1.12 shpjurcu.cpp,1.2,1.3 shpjygst.cpp,1.11,1.12 shpkabwe.cpp,1.11,1.12 shpkahbo.cpp,1.9,1.10 shpkatas.cpp,1.9,1.10 shpkatpo.cpp,1.15,1.16 shpklidr.cpp,1.6,1.7 shpkoaja.cpp,1.4,1.5 shpkoapa.cpp,1.6,1.7 shpkolfl.cpp,1.9,1.10 shpktesa.cpp,1.6,1.7 shpleimu.cpp,1.7,1.8 shplyrwa.cpp,1.10,1.11 shpmekpi.cpp,1.12,1.13 shpmoisp.cpp,1.8,1.9 shpmontr.cpp,1.7,1.8 shpnarlu.cpp,1.11,1.12 shpneccr.cpp,1.10,1.11 shpneodr.cpp,1.8,1.9 shpnisha.cpp,1.6,1.7 shpoliha.cpp,1.8,1.9 shpostdi.cpp,1.8,1.9 shppanav.cpp,1.7,1.8 shpphepa.cpp,1.13,1.14 shpplala.cpp,1.2,1.3 shpplane.cpp,1.9,1.10 shpqlore.cpp,1.8,1.9 shpquasi.cpp,1.11,1.12 shpquawr.cpp,1.12,1.13 shpraame.cpp,1.12,1.13 shpradfi.cpp,1.5,1.6 shprekas.cpp,1.7,1.8 shprogsq.cpp,1.13,1.14 shpsamat.cpp,1.14,1.15 shpsclfr.cpp,1.7,1.8 shpsefna.cpp,1.12,1.13 shpstaba.cpp,1.6,1.7 shpstrsc.cpp,1.9,1.10 shptauar.cpp,1.12,1.13 shptaubo.cpp,1.9,1.10 shptauda.cpp,1.8,1.9 shptauem.cpp,1.9,1.10 shptaufi.cpp,1.2,1.3 shptaugl.cpp,1.7,1.8 shptauhu.cpp,1.8,1.9 shptaule.cpp,1.11,1.12 shptaumc.cpp,1.6,1.7 shptaume.cpp,1.10,1.11 shptausl.cpp,1.2,1.3 shptaust.cpp,1.6,1.7 shptauto.cpp,1.2,1.3 shptautu.cpp,1.6,1.7 shptelno.cpp,1.7,1.8 shpterbi.cpp,1.2,1.3 shptougr.cpp,1.6,1.7 shptrige.cpp,1.6,1.7 shptulra.cpp,1.11,1.12 shpulzin.cpp,1.6,1.7 shpuosli.cpp,1.8,1.9 shpuxjba.cpp,1.5,1.6 shpvelcr.cpp,1.6,1.7 shpvenke.cpp,1.9,1.10 shpvezba.cpp,1.9,1.10 shpvioge.cpp,1.5,1.6 shpvirli.cpp,1.6,1.7 shpvuvji.cpp,1.2,1.3 shpwassu.cpp,1.13,1.14 shpwistr.cpp,1.8,1.9 shpwolmi.cpp,1.2,1.3 shpxaaar.cpp,1.8,1.9 shpxilcr.cpp,1.11,1.12 shpxxxas.cpp,1.9,1.10 shpxxxma.cpp,1.10,1.11 shpyevme.cpp,1.13,1.14 shpyurpa.cpp,1.12,1.13 shpyusra.cpp,1.11,1.12 shpzeksh.cpp,1.6,1.7

[<or...@pr...>]

Update of /cvsroot/timewarp/source/newships
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source/newships

Modified Files:
	shpaktgu.cpp shpalabc.cpp shpalckr.cpp shpalhdr.cpp 
	shparitr.cpp shparkpi.cpp shpartem.cpp shpayrbs.cpp 
	shpbahbu.cpp shpbatde.cpp shpbipka.cpp shpbogce.cpp 
	shpbubbo.cpp shpbubex.cpp shpchoex.cpp shpclofl.cpp 
	shpconca.cpp shpconho.cpp shpcrapl.cpp shpcresu.cpp 
	shpdajem.cpp shpdeees.cpp shpdjila.cpp shpdragr.cpp 
	shpducla.cpp shpdyzha.cpp shpearc2.cpp shpearc3.cpp 
	shpestgu.cpp shpfiear.cpp shpfopsl.cpp shpforsh.cpp 
	shpfresc.cpp shpgahmo.cpp shpgarty.cpp shpgerhe.cpp 
	shpglacr.cpp shpglads.cpp shphotsp.cpp shphubde.cpp 
	shphydcr.cpp shpiceco.cpp shpilwsp.cpp shpimpka.cpp 
	shpjnkla.cpp shpjurcu.cpp shpjygst.cpp shpkabwe.cpp 
	shpkahbo.cpp shpkatas.cpp shpkatpo.cpp shpklidr.cpp 
	shpkoaja.cpp shpkoapa.cpp shpkolfl.cpp shpktesa.cpp 
	shpleimu.cpp shplyrwa.cpp shpmekpi.cpp shpmoisp.cpp 
	shpmontr.cpp shpnarlu.cpp shpneccr.cpp shpneodr.cpp 
	shpnisha.cpp shpoliha.cpp shpostdi.cpp shppanav.cpp 
	shpphepa.cpp shpplala.cpp shpplane.cpp shpqlore.cpp 
	shpquasi.cpp shpquawr.cpp shpraame.cpp shpradfi.cpp 
	shprekas.cpp shprogsq.cpp shpsamat.cpp shpsclfr.cpp 
	shpsefna.cpp shpstaba.cpp shpstrsc.cpp shptauar.cpp 
	shptaubo.cpp shptauda.cpp shptauem.cpp shptaufi.cpp 
	shptaugl.cpp shptauhu.cpp shptaule.cpp shptaumc.cpp 
	shptaume.cpp shptausl.cpp shptaust.cpp shptauto.cpp 
	shptautu.cpp shptelno.cpp shpterbi.cpp shptougr.cpp 
	shptrige.cpp shptulra.cpp shpulzin.cpp shpuosli.cpp 
	shpuxjba.cpp shpvelcr.cpp shpvenke.cpp shpvezba.cpp 
	shpvioge.cpp shpvirli.cpp shpvuvji.cpp shpwassu.cpp 
	shpwistr.cpp shpwolmi.cpp shpxaaar.cpp shpxilcr.cpp 
	shpxxxas.cpp shpxxxma.cpp shpyevme.cpp shpyurpa.cpp 
	shpyusra.cpp shpzeksh.cpp 
Log Message:
fixed project files, 
removed include paths, 
removed second gup.h, 
and #ifdefed scp.cpps dependancy upon gamex stuff

Index: shpaktgu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpaktgu.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shpaktgu.cpp	13 Jan 2004 01:15:26 -0000	1.2
--- shpaktgu.cpp	29 Jan 2004 21:20:29 -0000	1.3
***************
*** 1,4 ****
! #include "ship.h"
! #include "melee/mshot.h"
  REGISTER_FILE
  #include <string.h>
--- 1,4 ----
! #include "../ship.h"
! #include "../melee/mshot.h"
  REGISTER_FILE
  #include <string.h>

Index: shpalabc.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpalabc.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** shpalabc.cpp	13 Jan 2004 01:15:26 -0000	1.13
--- shpalabc.cpp	29 Jan 2004 21:20:29 -0000	1.14
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "util/aastr.h"
  
  #define turret_fire_frame_size 40
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../util/aastr.h"
  
  #define turret_fire_frame_size 40

Index: shpalckr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpalckr.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpalckr.cpp	13 Jan 2004 01:15:26 -0000	1.10
--- shpalckr.cpp	29 Jan 2004 21:20:29 -0000	1.11
***************
*** 1,8 ****
! #include "ship.h"
  REGISTER_FILE
! #include "scp.h"
! #include "util/aastr.h"
! #include "melee/mview.h"
! #include "melee/manim.h"
  
  // if you change the order you have to change the increment in the code too
--- 1,8 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../scp.h"
! #include "../util/aastr.h"
! #include "../melee/mview.h"
! #include "../melee/manim.h"
  
  // if you change the order you have to change the increment in the code too

Index: shpalhdr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpalhdr.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpalhdr.cpp	13 Jan 2004 01:15:26 -0000	1.10
--- shpalhdr.cpp	29 Jan 2004 21:20:29 -0000	1.11
***************
*** 1,4 ****
! #include "ship.h"
! #include "melee/mview.h"
  
  REGISTER_FILE
--- 1,4 ----
! #include "../ship.h"
! #include "../melee/mview.h"
  
  REGISTER_FILE

Index: shparitr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shparitr.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shparitr.cpp	13 Jan 2004 01:15:26 -0000	1.11
--- shparitr.cpp	29 Jan 2004 21:20:29 -0000	1.12
***************
*** 19,23 ****
  ******************************************************************************/
  
! #include "ship.h"
  REGISTER_FILE
  
--- 19,23 ----
  ******************************************************************************/
  
! #include "../ship.h"
  REGISTER_FILE
  

Index: shparkpi.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shparkpi.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shparkpi.cpp	13 Jan 2004 01:15:26 -0000	1.10
--- shparkpi.cpp	29 Jan 2004 21:20:29 -0000	1.11
***************
*** 1,4 ****
! #include "ship.h"
! #include "melee/mview.h"
  REGISTER_FILE
  
--- 1,4 ----
! #include "../ship.h"
! #include "../melee/mview.h"
  REGISTER_FILE
  

Index: shpartem.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpartem.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpartem.cpp	13 Jan 2004 01:15:26 -0000	1.9
--- shpartem.cpp	29 Jan 2004 21:20:29 -0000	1.10
***************
*** 1,4 ****
! #include "ship.h"
! #include "melee/mview.h"
  REGISTER_FILE
  
--- 1,4 ----
! #include "../ship.h"
! #include "../melee/mview.h"
  REGISTER_FILE
  

Index: shpayrbs.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpayrbs.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** shpayrbs.cpp	13 Jan 2004 01:15:26 -0000	1.17
--- shpayrbs.cpp	29 Jan 2004 21:20:29 -0000	1.18
***************
*** 1,12 ****
  
  
! #include "ship.h"
! #include "melee/mview.h"
  REGISTER_FILE
  
  #include <stdio.h>
  
! #include "frame.h"
! #include "other/shippart.h"
  
  
--- 1,12 ----
  
  
! #include "../ship.h"
! #include "../melee/mview.h"
  REGISTER_FILE
  
  #include <stdio.h>
  
! #include "../frame.h"
! #include "../other/shippart.h"
  
  

Index: shpbahbu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpbahbu.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shpbahbu.cpp	13 Jan 2004 01:15:26 -0000	1.2
--- shpbahbu.cpp	29 Jan 2004 21:20:29 -0000	1.3
***************
*** 1,6 ****
  
! #include "ship.h"
  
! #include "frame.h"
  
  REGISTER_FILE
--- 1,6 ----
  
! #include "../ship.h"
  
! #include "../frame.h"
  
  REGISTER_FILE

Index: shpbatde.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpbatde.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** shpbatde.cpp	13 Jan 2004 01:15:26 -0000	1.15
--- shpbatde.cpp	29 Jan 2004 21:20:29 -0000	1.16
***************
*** 1,9 ****
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mview.h"
  
! #include "sc1ships.h"
! #include "frame.h"
! #include "util/aastr.h"
  
  
--- 1,9 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mview.h"
  
! #include "../sc1ships.h"
! #include "../frame.h"
! #include "../util/aastr.h"
  
  

Index: shpbipka.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpbipka.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpbipka.cpp	13 Jan 2004 01:15:26 -0000	1.11
--- shpbipka.cpp	29 Jan 2004 21:20:29 -0000	1.12
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mview.h"
! #include "other/nullphas.h"
  
  #define BIPOLE_STABILITY 0.4
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mview.h"
! #include "../other/nullphas.h"
  
  #define BIPOLE_STABILITY 0.4

Index: shpbogce.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpbogce.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shpbogce.cpp	13 Jan 2004 01:15:26 -0000	1.2
--- shpbogce.cpp	29 Jan 2004 21:20:29 -0000	1.3
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpbubbo.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpbubbo.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** shpbubbo.cpp	13 Jan 2004 01:15:26 -0000	1.15
--- shpbubbo.cpp	29 Jan 2004 21:20:29 -0000	1.16
***************
*** 1,4 ****
! #include "ship.h"
! #include "melee/mview.h"
  
  // original by Tamaraw
--- 1,4 ----
! #include "../ship.h"
! #include "../melee/mview.h"
  
  // original by Tamaraw

Index: shpbubex.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpbubex.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpbubex.cpp	13 Jan 2004 01:15:27 -0000	1.8
--- shpbubex.cpp	29 Jan 2004 21:20:29 -0000	1.9
***************
*** 1,8 ****
  /* Modified from Xchagger */
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  class BubalosExecutioner : public Ship {
--- 1,8 ----
  /* Modified from Xchagger */
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  class BubalosExecutioner : public Ship {

Index: shpchoex.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpchoex.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpchoex.cpp	13 Jan 2004 01:15:27 -0000	1.9
--- shpchoex.cpp	29 Jan 2004 21:20:29 -0000	1.10
***************
*** 1,4 ****
! #include "ship.h"
! #include "melee/mcbodies.h"
  
  REGISTER_FILE
--- 1,4 ----
! #include "../ship.h"
! #include "../melee/mcbodies.h"
  
  REGISTER_FILE

Index: shpclofl.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpclofl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpclofl.cpp	13 Jan 2004 01:15:27 -0000	1.10
--- shpclofl.cpp	29 Jan 2004 21:20:29 -0000	1.11
***************
*** 1,8 ****
! #include "ship.h"
  
  REGISTER_FILE
! #include "frame.h"
! #include "melee/mcbodies.h"
! #include "melee/mview.h"
  
  /*
--- 1,8 ----
! #include "../ship.h"
  
  REGISTER_FILE
! #include "../frame.h"
! #include "../melee/mcbodies.h"
! #include "../melee/mview.h"
  
  /*

Index: shpconca.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpconca.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shpconca.cpp	13 Jan 2004 01:15:27 -0000	1.12
--- shpconca.cpp	29 Jan 2004 21:20:29 -0000	1.13
***************
*** 1,5 ****
  #include <stdio.h>
! #include "ship.h"
! #include "melee/mview.h"
  //#include "link.h"
  REGISTER_FILE
--- 1,5 ----
  #include <stdio.h>
! #include "../ship.h"
! #include "../melee/mview.h"
  //#include "link.h"
  REGISTER_FILE

Index: shpconho.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpconho.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpconho.cpp	13 Jan 2004 01:15:27 -0000	1.9
--- shpconho.cpp	29 Jan 2004 21:20:29 -0000	1.10
***************
*** 1,9 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "melee/mmain.h"
! #include "melee/mcbodies.h"
  
! #include "frame.h"
  
  #define BCC 3
--- 1,9 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../melee/mmain.h"
! #include "../melee/mcbodies.h"
  
! #include "../frame.h"
  
  #define BCC 3

Index: shpcrapl.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpcrapl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpcrapl.cpp	13 Jan 2004 01:15:27 -0000	1.6
--- shpcrapl.cpp	29 Jan 2004 21:20:29 -0000	1.7
***************
*** 1,9 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
! #include "melee/mcbodies.h"
  
  
--- 1,9 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
! #include "../melee/mcbodies.h"
  
  

Index: shpcresu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpcresu.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpcresu.cpp	13 Jan 2004 01:15:27 -0000	1.8
--- shpcresu.cpp	29 Jan 2004 21:20:29 -0000	1.9
***************
*** 1,8 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  
--- 1,8 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  

Index: shpdajem.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpdajem.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpdajem.cpp	13 Jan 2004 01:15:27 -0000	1.9
--- shpdajem.cpp	29 Jan 2004 21:20:29 -0000	1.10
***************
*** 1,8 ****
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "melee/mframe.h"
! #include "melee/mview.h"
  
  class DajielkaCruiser;
--- 1,8 ----
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../melee/mframe.h"
! #include "../melee/mview.h"
  
  class DajielkaCruiser;

Index: shpdeees.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpdeees.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shpdeees.cpp	13 Jan 2004 01:15:27 -0000	1.2
--- shpdeees.cpp	29 Jan 2004 21:20:29 -0000	1.3
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mcbodies.h"
! #include "other/objanim.h"
  
  #define DEEP_SPACE_ANIM_RATE 90
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mcbodies.h"
! #include "../other/objanim.h"
  
  #define DEEP_SPACE_ANIM_RATE 90

Index: shpdjila.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpdjila.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpdjila.cpp	13 Jan 2004 01:15:27 -0000	1.7
--- shpdjila.cpp	29 Jan 2004 21:20:29 -0000	1.8
***************
*** 4,18 ****
  -Culture20
  */
! #include "ship.h"
  REGISTER_FILE
  
! #include "melee/mmain.h"
! #include "melee/mcbodies.h"
  
  
  
! #include "melee/mshppan.h"
  
! #include "frame.h"
  
  #define BCC 3
--- 4,18 ----
  -Culture20
  */
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../melee/mmain.h"
! #include "../melee/mcbodies.h"
  
  
  
! #include "../melee/mshppan.h"
  
! #include "../frame.h"
  
  #define BCC 3

Index: shpdragr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpdragr.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpdragr.cpp	13 Jan 2004 01:15:27 -0000	1.6
--- shpdragr.cpp	29 Jan 2004 21:20:29 -0000	1.7
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  class DraxMine;
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  class DraxMine;

Index: shpducla.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpducla.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shpducla.cpp	13 Jan 2004 01:15:27 -0000	1.12
--- shpducla.cpp	29 Jan 2004 21:20:29 -0000	1.13
***************
*** 23,30 ****
  */
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  
--- 23,30 ----
  */
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  

Index: shpdyzha.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpdyzha.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpdyzha.cpp	13 Jan 2004 01:15:27 -0000	1.10
--- shpdyzha.cpp	29 Jan 2004 21:20:29 -0000	1.11
***************
*** 1,11 ****
! #include "ship.h"
  REGISTER_FILE
  
  //#include "sc1ships.h"
  
! #include "melee.h"
! #include "melee/mshot.h"
! #include "melee/mship.h"
! #include "melee/manim.h"
  
  
--- 1,11 ----
! #include "../ship.h"
  REGISTER_FILE
  
  //#include "sc1ships.h"
  
! #include "../melee.h"
! #include "../melee/mshot.h"
! #include "../melee/mship.h"
! #include "../melee/manim.h"
  
  

Index: shpearc2.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpearc2.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpearc2.cpp	13 Jan 2004 01:15:27 -0000	1.6
--- shpearc2.cpp	29 Jan 2004 21:20:29 -0000	1.7
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpearc3.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpearc3.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shpearc3.cpp	13 Jan 2004 01:15:27 -0000	1.12
--- shpearc3.cpp	29 Jan 2004 21:20:29 -0000	1.13
***************
*** 1,4 ****
! #include "ship.h"
! #include "util/aastr.h"
  REGISTER_FILE
  
--- 1,4 ----
! #include "../ship.h"
! #include "../util/aastr.h"
  REGISTER_FILE
  

Index: shpestgu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpestgu.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpestgu.cpp	13 Jan 2004 01:15:27 -0000	1.11
--- shpestgu.cpp	29 Jan 2004 21:20:29 -0000	1.12
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  #include <string.h>
! #include "melee/mview.h"
  
  // platform relaying blink length [cyhawk]
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  #include <string.h>
! #include "../melee/mview.h"
  
  // platform relaying blink length [cyhawk]

Index: shpfiear.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpfiear.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpfiear.cpp	13 Jan 2004 01:15:27 -0000	1.8
--- shpfiear.cpp	29 Jan 2004 21:20:29 -0000	1.9
***************
*** 1,5 ****
! #include "ship.h"
! #include "frame.h"
! #include "melee/mview.h"
  REGISTER_FILE
  
--- 1,5 ----
! #include "../ship.h"
! #include "../frame.h"
! #include "../melee/mview.h"
  REGISTER_FILE
  

Index: shpfopsl.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpfopsl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpfopsl.cpp	13 Jan 2004 01:15:27 -0000	1.6
--- shpfopsl.cpp	29 Jan 2004 21:20:29 -0000	1.7
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpforsh.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpforsh.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpforsh.cpp	13 Jan 2004 01:15:27 -0000	1.8
--- shpforsh.cpp	29 Jan 2004 21:20:29 -0000	1.9
***************
*** 1,5 ****
  //ForevianShocker lousy code by Ric...@ig...
  
! #include "ship.h"
  REGISTER_FILE
  
--- 1,5 ----
  //ForevianShocker lousy code by Ric...@ig...
  
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpfresc.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpfresc.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpfresc.cpp	13 Jan 2004 01:15:27 -0000	1.7
--- shpfresc.cpp	29 Jan 2004 21:20:29 -0000	1.8
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  

Index: shpgahmo.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpgahmo.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpgahmo.cpp	13 Jan 2004 01:15:27 -0000	1.4
--- shpgahmo.cpp	29 Jan 2004 21:20:29 -0000	1.5
***************
*** 1,4 ****
! #include "ship.h"
! #include "melee/mview.h"
  
  REGISTER_FILE
--- 1,4 ----
! #include "../ship.h"
! #include "../melee/mview.h"
  
  REGISTER_FILE

Index: shpgarty.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpgarty.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpgarty.cpp	13 Jan 2004 01:15:27 -0000	1.9
--- shpgarty.cpp	29 Jan 2004 21:20:29 -0000	1.10
***************
*** 1,4 ****
! #include "ship.h"
! //#include "melee/mview.h"
  REGISTER_FILE
  
--- 1,4 ----
! #include "../ship.h"
! //#include "../melee/mview.h"
  REGISTER_FILE
  

Index: shpgerhe.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpgerhe.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** shpgerhe.cpp	13 Jan 2004 01:15:27 -0000	1.15
--- shpgerhe.cpp	29 Jan 2004 21:20:29 -0000	1.16
***************
*** 1,9 ****
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mview.h"
! #include "melee/mitems.h"
! #include "melee/mcbodies.h"
  
! #include "sc1ships.h"
  
  /*
--- 1,9 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mview.h"
! #include "../melee/mitems.h"
! #include "../melee/mcbodies.h"
  
! #include "../sc1ships.h"
  
  /*

Index: shpglacr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpglacr.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpglacr.cpp	13 Jan 2004 01:15:27 -0000	1.7
--- shpglacr.cpp	29 Jan 2004 21:20:29 -0000	1.8
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! //#include "sc1ships.h"
  
  class GlavriaCrTorpedo : public AnimatedShot {
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! //#include "../sc1ships.h"
  
  class GlavriaCrTorpedo : public AnimatedShot {

Index: shpglads.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpglads.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpglads.cpp	13 Jan 2004 01:15:27 -0000	1.6
--- shpglads.cpp	29 Jan 2004 21:20:29 -0000	1.7
***************
*** 1,5 ****
! #include "ship.h"
! #include "frame.h"
! #include "melee/mview.h"
  REGISTER_FILE
  
--- 1,5 ----
! #include "../ship.h"
! #include "../frame.h"
! #include "../melee/mview.h"
  REGISTER_FILE
  

Index: shphotsp.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shphotsp.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shphotsp.cpp	13 Jan 2004 01:15:27 -0000	1.10
--- shphotsp.cpp	29 Jan 2004 21:20:29 -0000	1.11
***************
*** 1,7 ****
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mview.h"
  
! #include "sc1ships.h"
  
  /* NOTES:
--- 1,7 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mview.h"
  
! #include "../sc1ships.h"
  
  /* NOTES:

Index: shphubde.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shphubde.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shphubde.cpp	13 Jan 2004 01:15:27 -0000	1.5
--- shphubde.cpp	29 Jan 2004 21:20:29 -0000	1.6
***************
*** 1,8 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  
--- 1,8 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  

Index: shphydcr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shphydcr.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shphydcr.cpp	13 Jan 2004 01:15:27 -0000	1.8
--- shphydcr.cpp	29 Jan 2004 21:20:29 -0000	1.9
***************
*** 1,13 ****
! #include "ship.h"
  
  REGISTER_FILE
  
! //#include "melee/mview.h"
! //#include "melee/manim.h"
  
! #include "melee/mcbodies.h"
  
! //#include "vtarget.h"
! //#include "sc1ships.h"
  
  
--- 1,13 ----
! #include "../ship.h"
  
  REGISTER_FILE
  
! //#include "../melee/mview.h"
! //#include "../melee/manim.h"
  
! #include "../melee/mcbodies.h"
  
! //#include "../other/vtarget.h"
! //#include "../sc1ships.h"
  
  

Index: shpiceco.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpiceco.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpiceco.cpp	13 Jan 2004 01:15:27 -0000	1.9
--- shpiceco.cpp	29 Jan 2004 21:20:29 -0000	1.10
***************
*** 5,12 ****
  */
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  class IceciConfusion : public Ship {
--- 5,12 ----
  */
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  class IceciConfusion : public Ship {

Index: shpilwsp.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpilwsp.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpilwsp.cpp	13 Jan 2004 01:15:27 -0000	1.9
--- shpilwsp.cpp	29 Jan 2004 21:20:29 -0000	1.10
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpimpka.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpimpka.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpimpka.cpp	13 Jan 2004 01:15:27 -0000	1.10
--- shpimpka.cpp	29 Jan 2004 21:20:29 -0000	1.11
***************
*** 1,5 ****
! #include "ship.h"
  REGISTER_FILE
! #include "scp.h"
  
  #define IMPERIAL_MIN_DEBRIS_LIFE 2000
--- 1,5 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../scp.h"
  
  #define IMPERIAL_MIN_DEBRIS_LIFE 2000

Index: shpjnkla.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpjnkla.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpjnkla.cpp	13 Jan 2004 01:15:27 -0000	1.11
--- shpjnkla.cpp	29 Jan 2004 21:20:30 -0000	1.12
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpjurcu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpjurcu.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shpjurcu.cpp	13 Jan 2004 01:15:27 -0000	1.2
--- shpjurcu.cpp	29 Jan 2004 21:20:30 -0000	1.3
***************
*** 1,4 ****
  
! #include "ship.h"
  
  REGISTER_FILE
--- 1,4 ----
  
! #include "../ship.h"
  
  REGISTER_FILE

Index: shpjygst.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpjygst.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpjygst.cpp	13 Jan 2004 01:15:27 -0000	1.11
--- shpjygst.cpp	29 Jan 2004 21:20:30 -0000	1.12
***************
*** 1,5 ****
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mview.h"
  
  /*
--- 1,5 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mview.h"
  
  /*

Index: shpkabwe.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpkabwe.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpkabwe.cpp	13 Jan 2004 01:15:27 -0000	1.11
--- shpkabwe.cpp	29 Jan 2004 21:20:30 -0000	1.12
***************
*** 1,7 ****
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mview.h"
! #include "frame.h"
! #include "util/aastr.h"
  
  
--- 1,7 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mview.h"
! #include "../frame.h"
! #include "../util/aastr.h"
  
  

Index: shpkahbo.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpkahbo.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpkahbo.cpp	13 Jan 2004 01:15:27 -0000	1.9
--- shpkahbo.cpp	29 Jan 2004 21:20:30 -0000	1.10
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "melee/mmain.h"
  
  #define SMALL_BOOMERANG 1
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../melee/mmain.h"
  
  #define SMALL_BOOMERANG 1

Index: shpkatas.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpkatas.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpkatas.cpp	13 Jan 2004 01:15:28 -0000	1.9
--- shpkatas.cpp	29 Jan 2004 21:20:30 -0000	1.10
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpkatpo.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpkatpo.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** shpkatpo.cpp	13 Jan 2004 01:15:28 -0000	1.15
--- shpkatpo.cpp	29 Jan 2004 21:20:30 -0000	1.16
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpklidr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpklidr.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpklidr.cpp	13 Jan 2004 01:15:28 -0000	1.6
--- shpklidr.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,12 ****
! #include "ship.h"
  REGISTER_FILE
  
  //#include "sc1ships.h"
  
! #include "melee.h"
! #include "melee/mshot.h"
! #include "melee/mship.h"
! #include "melee/manim.h"
! #include "melee/mview.h"
  
  
--- 1,12 ----
! #include "../ship.h"
  REGISTER_FILE
  
  //#include "sc1ships.h"
  
! #include "../melee.h"
! #include "../melee/mshot.h"
! #include "../melee/mship.h"
! #include "../melee/manim.h"
! #include "../melee/mview.h"
  
  

Index: shpkoaja.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpkoaja.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpkoaja.cpp	13 Jan 2004 01:15:28 -0000	1.4
--- shpkoaja.cpp	29 Jan 2004 21:20:30 -0000	1.5
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpkoapa.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpkoapa.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpkoapa.cpp	13 Jan 2004 01:15:28 -0000	1.6
--- shpkoapa.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpkolfl.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpkolfl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpkolfl.cpp	13 Jan 2004 01:15:28 -0000	1.9
--- shpkolfl.cpp	29 Jan 2004 21:20:30 -0000	1.10
***************
*** 1,8 ****
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mview.h"
  
! #include "sc1ships.h"
! #include "frame.h"
  
  
--- 1,8 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mview.h"
  
! #include "../sc1ships.h"
! #include "../frame.h"
  
  

Index: shpktesa.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpktesa.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpktesa.cpp	13 Jan 2004 01:15:28 -0000	1.6
--- shpktesa.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpleimu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpleimu.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpleimu.cpp	13 Jan 2004 01:15:28 -0000	1.7
--- shpleimu.cpp	29 Jan 2004 21:20:30 -0000	1.8
***************
*** 1,8 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  
--- 1,8 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  

Index: shplyrwa.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shplyrwa.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shplyrwa.cpp	13 Jan 2004 01:15:28 -0000	1.10
--- shplyrwa.cpp	29 Jan 2004 21:20:30 -0000	1.11
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! //#include "sc1ships.h"
  
  class LyrmristuWaBolt1 : public Missile {
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! //#include "../sc1ships.h"
  
  class LyrmristuWaBolt1 : public Missile {

Index: shpmekpi.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpmekpi.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shpmekpi.cpp	17 Jan 2004 22:47:23 -0000	1.12
--- shpmekpi.cpp	29 Jan 2004 21:20:30 -0000	1.13
***************
*** 1,8 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  
--- 1,8 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  

Index: shpmoisp.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpmoisp.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpmoisp.cpp	13 Jan 2004 01:15:28 -0000	1.8
--- shpmoisp.cpp	29 Jan 2004 21:20:30 -0000	1.9
***************
*** 1,8 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  
--- 1,8 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  

Index: shpmontr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpmontr.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpmontr.cpp	13 Jan 2004 01:15:28 -0000	1.7
--- shpmontr.cpp	29 Jan 2004 21:20:30 -0000	1.8
***************
*** 1,5 ****
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mview.h"
  
  #define MONO_TRON_SEGMENTS_PER_SPACE 6
--- 1,5 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mview.h"
  
  #define MONO_TRON_SEGMENTS_PER_SPACE 6

Index: shpnarlu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpnarlu.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpnarlu.cpp	13 Jan 2004 01:15:28 -0000	1.11
--- shpnarlu.cpp	29 Jan 2004 21:20:30 -0000	1.12
***************
*** 1,10 ****
! #include "ship.h"
  REGISTER_FILE
  
  #define NAROOL_POISON_ID     0x1122
  
! #include "util/aastr.h"
! #include "melee/mview.h"
! #include "frame.h"
  
  #include <stdlib.h>
--- 1,10 ----
! #include "../ship.h"
  REGISTER_FILE
  
  #define NAROOL_POISON_ID     0x1122
  
! #include "../util/aastr.h"
! #include "../melee/mview.h"
! #include "../frame.h"
  
  #include <stdlib.h>

Index: shpneccr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpneccr.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpneccr.cpp	13 Jan 2004 01:15:28 -0000	1.10
--- shpneccr.cpp	29 Jan 2004 21:20:30 -0000	1.11
***************
*** 1,11 ****
! #include "ship.h"
  REGISTER_FILE
  
! //#include "sc1ships.h"
  
! #include "melee.h"
! #include "melee/mshot.h"
! #include "melee/mship.h"
! #include "melee/manim.h"
  
  
--- 1,11 ----
! #include "../ship.h"
  REGISTER_FILE
  
! //#include "../sc1ships.h"
  
! #include "../melee.h"
! #include "../melee/mshot.h"
! #include "../melee/mship.h"
! #include "../melee/manim.h"
  
  

Index: shpneodr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpneodr.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpneodr.cpp	13 Jan 2004 01:15:28 -0000	1.8
--- shpneodr.cpp	29 Jan 2004 21:20:30 -0000	1.9
***************
*** 1,8 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  
--- 1,8 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  

Index: shpnisha.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpnisha.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpnisha.cpp	13 Jan 2004 01:15:28 -0000	1.6
--- shpnisha.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,10 ****
  
  
! #include "ship.h"
! #include "melee/mview.h"
  
  REGISTER_FILE
  
! //#include "sc1ships.h"
  
  class NisskHarasser : public Ship {
--- 1,10 ----
  
  
! #include "../ship.h"
! #include "../melee/mview.h"
  
  REGISTER_FILE
  
! //#include "../sc1ships.h"
  
  class NisskHarasser : public Ship {

Index: shpoliha.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpoliha.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpoliha.cpp	13 Jan 2004 01:15:28 -0000	1.8
--- shpoliha.cpp	29 Jan 2004 21:20:30 -0000	1.9
***************
*** 1,9 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
! #include "other/shippart.h"
  
  
--- 1,9 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
! #include "../other/shippart.h"
  
  

Index: shpostdi.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpostdi.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpostdi.cpp	13 Jan 2004 01:15:28 -0000	1.8
--- shpostdi.cpp	29 Jan 2004 21:20:30 -0000	1.9
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shppanav.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shppanav.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shppanav.cpp	13 Jan 2004 01:15:28 -0000	1.7
--- shppanav.cpp	29 Jan 2004 21:20:30 -0000	1.8
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  

Index: shpphepa.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpphepa.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** shpphepa.cpp	13 Jan 2004 01:15:28 -0000	1.13
--- shpphepa.cpp	29 Jan 2004 21:20:30 -0000	1.14
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpplala.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpplala.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shpplala.cpp	13 Jan 2004 01:15:28 -0000	1.2
--- shpplala.cpp	29 Jan 2004 21:20:30 -0000	1.3
***************
*** 25,32 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  class PlanetLander : public Ship {
--- 25,32 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  class PlanetLander : public Ship {

Index: shpplane.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpplane.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpplane.cpp	13 Jan 2004 01:15:28 -0000	1.9
--- shpplane.cpp	29 Jan 2004 21:20:30 -0000	1.10
***************
*** 1,7 ****
! #include "ship.h"
! #include "melee/mship.h"
! #include "other/orbit.h"
  REGISTER_FILE
! #include "melee/mcbodies.h"
  
  /*
--- 1,7 ----
! #include "../ship.h"
! #include "../melee/mship.h"
! #include "../other/orbit.h"
  REGISTER_FILE
! #include "../melee/mcbodies.h"
  
  /*

Index: shpqlore.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpqlore.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpqlore.cpp	13 Jan 2004 01:15:28 -0000	1.8
--- shpqlore.cpp	29 Jan 2004 21:20:30 -0000	1.9
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpquasi.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpquasi.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpquasi.cpp	13 Jan 2004 01:15:28 -0000	1.11
--- shpquasi.cpp	29 Jan 2004 21:20:30 -0000	1.12
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  

Index: shpquawr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpquawr.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shpquawr.cpp	17 Jan 2004 22:47:23 -0000	1.12
--- shpquawr.cpp	29 Jan 2004 21:20:30 -0000	1.13
***************
*** 1,5 ****
  
! #include "ship.h"
! //#include "melee/mview.h"
  
  class QuarKathWraith : public Ship {
--- 1,5 ----
  
! #include "../ship.h"
! //#include "../melee/mview.h"
  
  class QuarKathWraith : public Ship {

Index: shpraame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpraame.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shpraame.cpp	13 Jan 2004 01:15:28 -0000	1.12
--- shpraame.cpp	29 Jan 2004 21:20:30 -0000	1.13
***************
*** 1,4 ****
! #include "ship.h"
! #include "util/aastr.h"
  
  #define RAALRITH_POISON_ID     0x2233
--- 1,4 ----
! #include "../ship.h"
! #include "../util/aastr.h"
  
  #define RAALRITH_POISON_ID     0x2233

Index: shpradfi.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpradfi.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpradfi.cpp	13 Jan 2004 01:15:28 -0000	1.5
--- shpradfi.cpp	29 Jan 2004 21:20:30 -0000	1.6
***************
*** 1,8 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  
--- 1,8 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  

Index: shprekas.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shprekas.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shprekas.cpp	13 Jan 2004 01:15:28 -0000	1.7
--- shprekas.cpp	29 Jan 2004 21:20:30 -0000	1.8
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shprogsq.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shprogsq.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** shprogsq.cpp	13 Jan 2004 01:15:28 -0000	1.13
--- shprogsq.cpp	29 Jan 2004 21:20:30 -0000	1.14
***************
*** 1,11 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "util/aastr.h"
  
  #include <string.h>
  #include <stdio.h>
  
! #include "melee/mview.h"
  
  
--- 1,11 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../util/aastr.h"
  
  #include <string.h>
  #include <stdio.h>
  
! #include "../melee/mview.h"
  
  

Index: shpsamat.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpsamat.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** shpsamat.cpp	13 Jan 2004 01:15:28 -0000	1.14
--- shpsamat.cpp	29 Jan 2004 21:20:30 -0000	1.15
***************
*** 1,3 ****
! #include "ship.h"
  
  /*
--- 1,3 ----
! #include "../ship.h"
  
  /*

Index: shpsclfr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpsclfr.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpsclfr.cpp	13 Jan 2004 01:15:28 -0000	1.7
--- shpsclfr.cpp	29 Jan 2004 21:20:30 -0000	1.8
***************
*** 1,4 ****
! #include "ship.h"
! #include "melee/mview.h"
  #include <math.h>
  
--- 1,4 ----
! #include "../ship.h"
! #include "../melee/mview.h"
  #include <math.h>
  

Index: shpsefna.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpsefna.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shpsefna.cpp	17 Jan 2004 22:47:23 -0000	1.12
--- shpsefna.cpp	29 Jan 2004 21:20:30 -0000	1.13
***************
*** 1,4 ****
! #include "ship.h"
! #include "frame.h"
  REGISTER_FILE
  
--- 1,4 ----
! #include "../ship.h"
! #include "../frame.h"
  REGISTER_FILE
  

Index: shpstaba.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpstaba.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpstaba.cpp	13 Jan 2004 01:15:28 -0000	1.6
--- shpstaba.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpstrsc.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpstrsc.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpstrsc.cpp	25 Jan 2004 12:40:50 -0000	1.9
--- shpstrsc.cpp	29 Jan 2004 21:20:30 -0000	1.10
***************
*** 9,13 ****
  /************************************************/
  
! #include "ship.h"
  REGISTER_FILE
  
--- 9,13 ----
  /************************************************/
  
! #include "../ship.h"
  REGISTER_FILE
  

Index: shptauar.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptauar.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shptauar.cpp	13 Jan 2004 01:15:28 -0000	1.12
--- shptauar.cpp	29 Jan 2004 21:20:30 -0000	1.13
***************
*** 3,9 ****
  #include <stdio.h>
  
! #include "ship.h"
! #include "util/aastr.h"
! #include "melee/mcbodies.h"
  
  
--- 3,9 ----
  #include <stdio.h>
  
! #include "../ship.h"
! #include "../util/aastr.h"
! #include "../melee/mcbodies.h"
  
  

Index: shptaubo.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptaubo.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shptaubo.cpp	13 Jan 2004 01:15:28 -0000	1.9
--- shptaubo.cpp	29 Jan 2004 21:20:30 -0000	1.10
***************
*** 1,5 ****
! #include "ship.h"
! #include "melee/mview.h"
! #include "frame.h"
  
  REGISTER_FILE
--- 1,5 ----
! #include "../ship.h"
! #include "../melee/mview.h"
! #include "../frame.h"
  
  REGISTER_FILE

Index: shptauda.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptauda.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shptauda.cpp	13 Jan 2004 01:15:28 -0000	1.8
--- shptauda.cpp	29 Jan 2004 21:20:30 -0000	1.9
***************
*** 1,6 ****
! #include "ship.h"
! #include "util/aastr.h"
! #include "melee/mview.h"
! #include "frame.h"
  
  REGISTER_FILE
--- 1,6 ----
! #include "../ship.h"
! #include "../util/aastr.h"
! #include "../melee/mview.h"
! #include "../frame.h"
  
  REGISTER_FILE

Index: shptauem.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptauem.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shptauem.cpp	13 Jan 2004 01:15:28 -0000	1.9
--- shptauem.cpp	29 Jan 2004 21:20:30 -0000	1.10
***************
*** 1,6 ****
! #include "ship.h"
! #include "util/aastr.h"
! #include "frame.h"
! #include "melee/mview.h"
  
  REGISTER_FILE
--- 1,6 ----
! #include "../ship.h"
! #include "../util/aastr.h"
! #include "../frame.h"
! #include "../melee/mview.h"
  
  REGISTER_FILE

Index: shptaufi.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptaufi.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shptaufi.cpp	13 Jan 2004 01:15:28 -0000	1.2
--- shptaufi.cpp	29 Jan 2004 21:20:30 -0000	1.3
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shptaugl.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptaugl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shptaugl.cpp	13 Jan 2004 01:15:28 -0000	1.7
--- shptaugl.cpp	29 Jan 2004 21:20:30 -0000	1.8
***************
*** 1,3 ****
! #include "ship.h"
  
  REGISTER_FILE
--- 1,3 ----
! #include "../ship.h"
  
  REGISTER_FILE

Index: shptauhu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptauhu.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shptauhu.cpp	13 Jan 2004 01:15:28 -0000	1.8
--- shptauhu.cpp	29 Jan 2004 21:20:30 -0000	1.9
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shptaule.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptaule.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shptaule.cpp	13 Jan 2004 01:15:28 -0000	1.11
--- shptaule.cpp	29 Jan 2004 21:20:30 -0000	1.12
***************
*** 1,7 ****
! #include "ship.h"
  
  REGISTER_FILE
  
! //#include "mview.h"
  
  
--- 1,7 ----
! #include "../ship.h"
  
  REGISTER_FILE
  
! //#include "../mview.h"
  
  

Index: shptaumc.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptaumc.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shptaumc.cpp	13 Jan 2004 01:15:28 -0000	1.6
--- shptaumc.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,7 ****
! #include "ship.h"
! #include "melee/mview.h"
! #include "frame.h"
! #include "util/aastr.h"
! #include "melee.h"
  REGISTER_FILE
  
--- 1,7 ----
! #include "../ship.h"
! #include "../melee/mview.h"
! #include "../frame.h"
! #include "../util/aastr.h"
! #include "../melee.h"
  REGISTER_FILE
  

Index: shptaume.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptaume.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shptaume.cpp	13 Jan 2004 01:15:28 -0000	1.10
--- shptaume.cpp	29 Jan 2004 21:20:30 -0000	1.11
***************
*** 1,5 ****
! #include "ship.h"
! #include "melee/mview.h"
! #include "frame.h"
  
  REGISTER_FILE
--- 1,5 ----
! #include "../ship.h"
! #include "../melee/mview.h"
! #include "../frame.h"
  
  REGISTER_FILE

Index: shptausl.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptausl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shptausl.cpp	13 Jan 2004 01:15:28 -0000	1.2
--- shptausl.cpp	29 Jan 2004 21:20:30 -0000	1.3
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shptaust.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptaust.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shptaust.cpp	13 Jan 2004 01:15:28 -0000	1.6
--- shptaust.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,3 ****
! #include "ship.h"
  
  REGISTER_FILE
--- 1,3 ----
! #include "../ship.h"
  
  REGISTER_FILE

Index: shptauto.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptauto.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shptauto.cpp	13 Jan 2004 01:15:28 -0000	1.2
--- shptauto.cpp	29 Jan 2004 21:20:30 -0000	1.3
***************
*** 1,4 ****
! #include "ship.h"
! #include "melee/mview.h"
  
  REGISTER_FILE
--- 1,4 ----
! #include "../ship.h"
! #include "../melee/mview.h"
  
  REGISTER_FILE

Index: shptautu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptautu.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shptautu.cpp	13 Jan 2004 01:15:28 -0000	1.6
--- shptautu.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shptelno.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptelno.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shptelno.cpp	13 Jan 2004 01:15:28 -0000	1.7
--- shptelno.cpp	29 Jan 2004 21:20:30 -0000	1.8
***************
*** 1,8 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  class TelluriNovaShield;
--- 1,8 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  class TelluriNovaShield;

Index: shpterbi.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpterbi.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shpterbi.cpp	13 Jan 2004 01:15:28 -0000	1.2
--- shpterbi.cpp	29 Jan 2004 21:20:30 -0000	1.3
***************
*** 1,7 ****
! #include "ship.h"
  REGISTER_FILE
  #include <stdio.h>
! #include "melee/mview.h"
! #include "ais.h"
  
  //#define TERON_COLLISION_FORWARDING
--- 1,7 ----
! #include "../ship.h"
  REGISTER_FILE
  #include <stdio.h>
! #include "../melee/mview.h"
! #include "../ais.h"
  
  //#define TERON_COLLISION_FORWARDING

Index: shptougr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptougr.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shptougr.cpp	13 Jan 2004 01:15:28 -0000	1.6
--- shptougr.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,8 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  
--- 1,8 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  

Index: shptrige.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptrige.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shptrige.cpp	13 Jan 2004 01:15:28 -0000	1.6
--- shptrige.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 6,14 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
! #include "melee/mview.h"
  #include <stdio.h>
  
--- 6,14 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
! #include "../melee/mview.h"
  #include <stdio.h>
  

Index: shptulra.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptulra.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shptulra.cpp	13 Jan 2004 01:15:28 -0000	1.11
--- shptulra.cpp	29 Jan 2004 21:20:30 -0000	1.12
***************
*** 1,5 ****
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mview.h"
  
  #define TULKON_DEVICE_MIN_DIST 26
--- 1,5 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mview.h"
  
  #define TULKON_DEVICE_MIN_DIST 26

Index: shpulzin.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpulzin.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpulzin.cpp	13 Jan 2004 01:15:28 -0000	1.6
--- shpulzin.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,4 ****
! #include "ship.h"
! #include "melee/mview.h"
  
  REGISTER_FILE
--- 1,4 ----
! #include "../ship.h"
! #include "../melee/mview.h"
  
  REGISTER_FILE

Index: shpuosli.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpuosli.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpuosli.cpp	13 Jan 2004 01:15:28 -0000	1.8
--- shpuosli.cpp	29 Jan 2004 21:20:30 -0000	1.9
***************
*** 5,12 ****
  */
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  class UoiSlicer : public Ship {
--- 5,12 ----
  */
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  class UoiSlicer : public Ship {

Index: shpuxjba.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpuxjba.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpuxjba.cpp	13 Jan 2004 01:15:28 -0000	1.5
--- shpuxjba.cpp	29 Jan 2004 21:20:30 -0000	1.6
***************
*** 1,8 ****
  
  
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  
--- 1,8 ----
  
  
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  

Index: shpvelcr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpvelcr.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpvelcr.cpp	13 Jan 2004 01:15:28 -0000	1.6
--- shpvelcr.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! //#include "sc1ships.h"
  
  
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! //#include "../sc1ships.h"
  
  

Index: shpvenke.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpvenke.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpvenke.cpp	13 Jan 2004 01:15:28 -0000	1.9
--- shpvenke.cpp	29 Jan 2004 21:20:30 -0000	1.10
***************
*** 1,4 ****
! #include "ship.h"
! #include "melee/mview.h"
  #include <math.h>
  
--- 1,4 ----
! #include "../ship.h"
! #include "../melee/mview.h"
  #include <math.h>
  

Index: shpvezba.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpvezba.cpp,v
retr...
 
[truncated message content]

[Timewarp-commit] source/sc3ships shpclapi.cpp,1.6,1.7 shpdakvi.cpp,1.4,1.5 shpdooco.cpp,1.4,1.5 shpexqen.cpp,1.6,1.7 shpharra.cpp,1.4,1.5 shpherex.cpp,1.4,1.5 shpktacr.cpp,1.4,1.5 shplk_sa.cpp,1.4,1.5 shpowavo.cpp,1.7,1.8 shpplopl.cpp,1.4,1.5 shpvyrin.cpp,1.8,1.9 shpxchex.cpp,1.10,1.11

[<or...@pr...>]

Update of /cvsroot/timewarp/source/sc3ships
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source/sc3ships

Modified Files:
	shpclapi.cpp shpdakvi.cpp shpdooco.cpp shpexqen.cpp 
	shpharra.cpp shpherex.cpp shpktacr.cpp shplk_sa.cpp 
	shpowavo.cpp shpplopl.cpp shpvyrin.cpp shpxchex.cpp 
Log Message:
fixed project files, 
removed include paths, 
removed second gup.h, 
and #ifdefed scp.cpps dependancy upon gamex stuff

Index: shpclapi.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpclapi.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpclapi.cpp	13 Jan 2004 01:15:29 -0000	1.6
--- shpclapi.cpp	29 Jan 2004 21:20:31 -0000	1.7
***************
*** 1,5 ****
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mcbodies.h"
  
  class ClairconctlarPinnacle : public Ship {
--- 1,5 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mcbodies.h"
  
  class ClairconctlarPinnacle : public Ship {

Index: shpdakvi.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpdakvi.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpdakvi.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shpdakvi.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpdooco.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpdooco.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpdooco.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shpdooco.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpexqen.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpexqen.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpexqen.cpp	13 Jan 2004 01:15:29 -0000	1.6
--- shpexqen.cpp	29 Jan 2004 21:20:31 -0000	1.7
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpharra.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpharra.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpharra.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shpharra.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  #define BCC 3
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  #define BCC 3

Index: shpherex.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpherex.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpherex.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shpherex.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpktacr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpktacr.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpktacr.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shpktacr.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shplk_sa.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shplk_sa.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shplk_sa.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shplk_sa.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  class LkSanctorum : public Ship {
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  class LkSanctorum : public Ship {

Index: shpowavo.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpowavo.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpowavo.cpp	25 Jan 2004 12:41:06 -0000	1.7
--- shpowavo.cpp	29 Jan 2004 21:20:31 -0000	1.8
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "melee/mmain.h"
  
  #define OWADISABLE_SPEC 0x36
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../melee/mmain.h"
  
  #define OWADISABLE_SPEC 0x36

Index: shpplopl.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpplopl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpplopl.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shpplopl.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  class PloxisPlunderer : public Ship {
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  class PloxisPlunderer : public Ship {

Index: shpvyrin.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpvyrin.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpvyrin.cpp	13 Jan 2004 01:15:29 -0000	1.8
--- shpvyrin.cpp	29 Jan 2004 21:20:31 -0000	1.9
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  

Index: shpxchex.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpxchex.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpxchex.cpp	25 Jan 2004 12:41:08 -0000	1.10
--- shpxchex.cpp	29 Jan 2004 21:20:31 -0000	1.11
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
  #define XCHAGGERDISABLE_SPEC 0x37
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
  #define XCHAGGERDISABLE_SPEC 0x37

[Timewarp-commit] source scp.cpp,1.36,1.37 gup.h,1.3,NONE

[<or...@pr...>]

Update of /cvsroot/timewarp/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source

Modified Files:
	scp.cpp 
Removed Files:
	gup.h 
Log Message:
fixed project files, 
removed include paths, 
removed second gup.h, 
and #ifdefed scp.cpps dependancy upon gamex stuff

Index: scp.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/scp.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** scp.cpp	25 Jan 2004 12:39:48 -0000	1.36
--- scp.cpp	29 Jan 2004 21:20:31 -0000	1.37
***************
*** 17,20 ****
--- 17,22 ----
   */
  
+ #define INCLUDE_GAMEX
+ 
  #include <stdlib.h>
  #include <stdio.h>
***************
*** 76,81 ****
  #define SCPGUI_TITLE   1
  
! #include "gamex/projectx.h"
  // for future use (Rob)
  
  Game *old_game = NULL;
--- 78,85 ----
  #define SCPGUI_TITLE   1
  
! #ifdef INCLUDE_GAMEX
! 	#include "gamex/projectx.h"
  // for future use (Rob)
+ #endif
  
  Game *old_game = NULL;
***************
*** 134,138 ****
--- 138,144 ----
  	MAIN_DIALOG_HELP,
  	MAIN_DIALOG_EXIT,
+ #ifdef INCLUDE_GAMEX
  	MAIN_DIALOG_FG,
+ #endif
  };
  
***************
*** 146,150 ****
--- 152,158 ----
    { d_button_proc,     45,   185,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Help", NULL, NULL },
    { d_button_proc,     45,   220,  170,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"Exit", NULL, NULL },
+ #ifdef INCLUDE_GAMEX
    { d_button_proc,     550,  440,   50,  30,   255,  0,    0,    D_EXIT,  0,    0,    (void *)"FG" , NULL, NULL },
+ #endif
    { d_tw_yield_proc,   0,    0,    0,    0,    255,  0,    0,    0,       0,    0,    NULL, NULL, NULL },
    { NULL,              0,    0,    0,    0,    255,  0,    0,    0,       1,    0,    NULL, NULL, NULL }
***************
*** 643,648 ****
  				showTitle();
  				break;
  			case MAIN_DIALOG_FG:
- 
  				disable();
  				play_fg(&scp, SCPGUI_MUSIC);
--- 651,656 ----
  				showTitle();
  				break;
+ #ifdef INCLUDE_GAMEX
  			case MAIN_DIALOG_FG:
  				disable();
  				play_fg(&scp, SCPGUI_MUSIC);
***************
*** 650,653 ****
--- 658,662 ----
  				showTitle();
  				break;
+ #endif
  		}
  	} while((mainRet != MAIN_DIALOG_EXIT) && (mainRet != -1));
***************
*** 808,813 ****
  			if (!strcmp(auto_play, "net1client")) play_net1client(auto_param, auto_port);
  			if (!strcmp(auto_play, "net1server")) play_net1server(auto_param, auto_port);
  			if (!strcmp(auto_play, "fg")) play_fg(&scp, SCPGUI_MUSIC);
! 
  		}
  		else {
--- 817,823 ----
  			if (!strcmp(auto_play, "net1client")) play_net1client(auto_param, auto_port);
  			if (!strcmp(auto_play, "net1server")) play_net1server(auto_param, auto_port);
+ #ifdef INCLUDE_GAMEX
  			if (!strcmp(auto_play, "fg")) play_fg(&scp, SCPGUI_MUSIC);
! #endif
  		}
  		else {

--- gup.h DELETED ---

[Timewarp-commit] source/sc2ships shpchmav.cpp,1.10,1.11 shpdruma.cpp,1.6,1.7 shpkohma.cpp,1.4,1.5 shpmeltr.cpp,1.7,1.8 shporzne.cpp,1.10,1.11 shppkufu.cpp,1.9,1.10 shpslypr.cpp,1.11,1.12 shpsupbl.cpp,1.4,1.5 shpthrto.cpp,1.9,1.10 shputwju.cpp,1.4,1.5 shpzfpst.cpp,1.8,1.9

[<or...@pr...>]

Update of /cvsroot/timewarp/source/sc2ships
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/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:
fixed project files, 
removed include paths, 
removed second gup.h, 
and #ifdefed scp.cpps dependancy upon gamex stuff

Index: shpchmav.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc2ships/shpchmav.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpchmav.cpp	13 Jan 2004 01:15:29 -0000	1.10
--- shpchmav.cpp	29 Jan 2004 21:20:31 -0000	1.11
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpdruma.cpp	13 Jan 2004 01:15:29 -0000	1.6
--- shpdruma.cpp	29 Jan 2004 21:20:31 -0000	1.7
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpkohma.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shpkohma.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpmeltr.cpp	13 Jan 2004 01:15:29 -0000	1.7
--- shpmeltr.cpp	29 Jan 2004 21:20:31 -0000	1.8
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shporzne.cpp	13 Jan 2004 01:15:29 -0000	1.10
--- shporzne.cpp	29 Jan 2004 21:20:31 -0000	1.11
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shppkufu.cpp	13 Jan 2004 01:15:29 -0000	1.9
--- shppkufu.cpp	29 Jan 2004 21:20:31 -0000	1.10
***************
*** 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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpslypr.cpp	13 Jan 2004 01:15:29 -0000	1.11
--- shpslypr.cpp	29 Jan 2004 21:20:31 -0000	1.12
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpsupbl.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shpsupbl.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpthrto.cpp	13 Jan 2004 01:15:29 -0000	1.9
--- shpthrto.cpp	29 Jan 2004 21:20:31 -0000	1.10
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shputwju.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shputwju.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpzfpst.cpp	13 Jan 2004 01:15:29 -0000	1.8
--- shpzfpst.cpp	29 Jan 2004 21:20:31 -0000	1.9
***************
*** 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 {

[Timewarp-commit] twwin.dsp,1.27,1.28

[<or...@pr...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322

Modified Files:
	twwin.dsp 
Log Message:
fixed project files, 
removed include paths, 
removed second gup.h, 
and #ifdefed scp.cpps dependancy upon gamex stuff

[Timewarp-commit] source/sc1ships shpandgu.cpp,1.9,1.10 shparisk.cpp,1.4,1.5 shpchebr.cpp,1.6,1.7 shpearcr.cpp,1.4,1.5 shpilwav.cpp,1.5,1.6 shpkzedr.cpp,1.6,1.7 shpmmrxf.cpp,1.6,1.7 shpmycpo.cpp,1.6,1.7 shpshosc.cpp,1.4,1.5 shpspael.cpp,1.4,1.5 shpsyrpe.cpp,1.8,1.9 shpumgdr.cpp,1.10,1.11 shpvuxin.cpp,1.7,1.8 shpyehte.cpp,1.4,1.5

[<or...@pr...>]

Update of /cvsroot/timewarp/source/sc1ships
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source/sc1ships

Modified Files:
	shpandgu.cpp shparisk.cpp shpchebr.cpp shpearcr.cpp 
	shpilwav.cpp shpkzedr.cpp shpmmrxf.cpp shpmycpo.cpp 
	shpshosc.cpp shpspael.cpp shpsyrpe.cpp shpumgdr.cpp 
	shpvuxin.cpp shpyehte.cpp 
Log Message:
fixed project files, 
removed include paths, 
removed second gup.h, 
and #ifdefed scp.cpps dependancy upon gamex stuff

Index: shpandgu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpandgu.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpandgu.cpp	25 Jan 2004 12:41:04 -0000	1.9
--- shpandgu.cpp	29 Jan 2004 21:20:31 -0000	1.10
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  class AndrosynthBubble : public AnimatedShot {
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  class AndrosynthBubble : public AnimatedShot {

Index: shparisk.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shparisk.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shparisk.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shparisk.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  ArilouSkiff::ArilouSkiff(Vector2 opos, double angle, ShipData *data, unsigned int code) 
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  ArilouSkiff::ArilouSkiff(Vector2 opos, double angle, ShipData *data, unsigned int code) 

Index: shpchebr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpchebr.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpchebr.cpp	13 Jan 2004 01:15:29 -0000	1.6
--- shpchebr.cpp	29 Jan 2004 21:20:31 -0000	1.7
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  #define MAX_DOGIS 4
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  #define MAX_DOGIS 4

Index: shpearcr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpearcr.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpearcr.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shpearcr.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  class EarthlingMissile : public HomingMissile {
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  class EarthlingMissile : public HomingMissile {

Index: shpilwav.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpilwav.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpilwav.cpp	13 Jan 2004 01:15:29 -0000	1.5
--- shpilwav.cpp	29 Jan 2004 21:20:31 -0000	1.6
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  int IlwrathAvenger::cloak_color[3] = { 15, 11, 9 };
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  int IlwrathAvenger::cloak_color[3] = { 15, 11, 9 };

Index: shpkzedr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpkzedr.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpkzedr.cpp	13 Jan 2004 01:15:29 -0000	1.6
--- shpkzedr.cpp	29 Jan 2004 21:20:31 -0000	1.7
***************
*** 1,7 ****
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mview.h"
  
! #include "sc1ships.h"
  
  class KzerZaMissile : public Missile {
--- 1,7 ----
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mview.h"
  
! #include "../sc1ships.h"
  
  class KzerZaMissile : public Missile {

Index: shpmmrxf.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpmmrxf.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpmmrxf.cpp	13 Jan 2004 01:15:29 -0000	1.6
--- shpmmrxf.cpp	29 Jan 2004 21:20:31 -0000	1.7
***************
*** 1,3 ****
! #include "ship.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../ship.h"
  REGISTER_FILE
  
***************
*** 5,9 ****
  #define Y_FORM 1
  
! #include "sc1ships.h"
  
  MmrnmhrmXForm::MmrnmhrmXForm(Vector2 opos, double shipAngle,
--- 5,9 ----
  #define Y_FORM 1
  
! #include "../sc1ships.h"
  
  MmrnmhrmXForm::MmrnmhrmXForm(Vector2 opos, double shipAngle,

Index: shpmycpo.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpmycpo.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpmycpo.cpp	13 Jan 2004 01:15:29 -0000	1.6
--- shpmycpo.cpp	29 Jan 2004 21:20:31 -0000	1.7
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  class MyconPlasma : public HomingMissile {
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  class MyconPlasma : public HomingMissile {

Index: shpshosc.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpshosc.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpshosc.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shpshosc.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  ShofixtiScout::ShofixtiScout(Vector2 opos, double angle, ShipData *data, unsigned int code) 
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  ShofixtiScout::ShofixtiScout(Vector2 opos, double angle, ShipData *data, unsigned int code) 

Index: shpspael.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpspael.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpspael.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shpspael.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  SpathiEluder::SpathiEluder(Vector2 opos, double angle, ShipData *data, unsigned int code) 
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  SpathiEluder::SpathiEluder(Vector2 opos, double angle, ShipData *data, unsigned int code) 

Index: shpsyrpe.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpsyrpe.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpsyrpe.cpp	13 Jan 2004 01:15:29 -0000	1.8
--- shpsyrpe.cpp	29 Jan 2004 21:20:31 -0000	1.9
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  class CrewPod : public SpaceObject {
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  class CrewPod : public SpaceObject {

Index: shpumgdr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpumgdr.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpumgdr.cpp	13 Jan 2004 01:15:29 -0000	1.10
--- shpumgdr.cpp	29 Jan 2004 21:20:31 -0000	1.11
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  class UmgahCone : public SpaceObject {
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  class UmgahCone : public SpaceObject {

Index: shpvuxin.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpvuxin.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpvuxin.cpp	13 Jan 2004 01:15:29 -0000	1.7
--- shpvuxin.cpp	29 Jan 2004 21:20:31 -0000	1.8
***************
*** 1,6 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "sc1ships.h"
  
  class VuxLimpet : public AnimatedShot {
--- 1,6 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../sc1ships.h"
  
  class VuxLimpet : public AnimatedShot {

Index: shpyehte.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpyehte.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpyehte.cpp	13 Jan 2004 01:15:29 -0000	1.4
--- shpyehte.cpp	29 Jan 2004 21:20:31 -0000	1.5
***************
*** 1,8 ****
! #include "ship.h"
  REGISTER_FILE
  
! #include "frame.h"
  
! #include "sc1ships.h"
  
  YehatTerminator::YehatTerminator(Vector2 opos, double angle, ShipData *data, unsigned int code) 
--- 1,8 ----
! #include "../ship.h"
  REGISTER_FILE
  
! #include "../frame.h"
  
! #include "../sc1ships.h"
  
  YehatTerminator::YehatTerminator(Vector2 opos, double angle, ShipData *data, unsigned int code) 

[Timewarp-commit] source/other gdialog.cpp,1.3,1.4 gevent.cpp,1.5,1.6 gquest.cpp,1.9,1.10 gup.cpp,1.8,1.9 gup.h,1.5,1.6 nullphas.cpp,1.6,1.7 nullphas.h,1.5,1.6 objanim.cpp,1.6,1.7 objanim.h,1.5,1.6 orbit.cpp,1.7,1.8 planet3d.cpp,1.15,1.16 planet3d.h,1.3,1.4 radar.cpp,1.6,1.7 radar.h,1.5,1.6 shippart.cpp,1.9,1.10 shippart.h,1.8,1.9 vbodies.cpp,1.10,1.11 vbodies.h,1.5,1.6 vtarget.cpp,1.6,1.7

[<or...@pr...>]

Update of /cvsroot/timewarp/source/other
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source/other

Modified Files:
	gdialog.cpp gevent.cpp gquest.cpp gup.cpp gup.h nullphas.cpp 
	nullphas.h objanim.cpp objanim.h orbit.cpp planet3d.cpp 
	planet3d.h radar.cpp radar.h shippart.cpp shippart.h 
	vbodies.cpp vbodies.h vtarget.cpp 
Log Message:
fixed project files, 
removed include paths, 
removed second gup.h, 
and #ifdefed scp.cpps dependancy upon gamex stuff

Index: gdialog.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/gdialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gdialog.cpp	17 Jan 2004 15:42:39 -0000	1.3
--- gdialog.cpp	29 Jan 2004 21:20:30 -0000	1.4
***************
*** 12,19 ****
  
  #include "gdialog.h"
! #include "games/ggob.h"
  
! #include "util/aautil.h"
! #include "util/aastr.h"
  
  #define gobgame ((GobGame*)game)
--- 12,19 ----
  
  #include "gdialog.h"
! #include "../games/ggob.h"
  
! #include "../util/aautil.h"
! #include "../util/aastr.h"
  
  #define gobgame ((GobGame*)game)

Index: gevent.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/gevent.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gevent.cpp	24 Jan 2004 21:02:44 -0000	1.5
--- gevent.cpp	29 Jan 2004 21:20:30 -0000	1.6
***************
*** 5,14 ****
  #endif
  
- #include "gevent.h"
  
! //#include "games/ggob.h"
! #include "melee.h"
  REGISTER_FILE
! #include "melee/mship.h"
  
  
--- 5,14 ----
  #endif
  
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../melee/mship.h"
! //#include "../games/ggob.h"
! #include "gevent.h"
  
  

Index: gquest.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/gquest.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gquest.cpp	24 Jan 2004 21:03:47 -0000	1.9
--- gquest.cpp	29 Jan 2004 21:20:30 -0000	1.10
***************
*** 5,13 ****
  #endif
  
! #include "games/ggob.h"
! #include "gdialog.h"
! #include "melee.h"
  REGISTER_FILE
! #include "melee/mship.h"
  
  static GobPlayer * g_player = NULL;
--- 5,13 ----
  #endif
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../melee/mship.h"
! #include "../games/ggob.h"
! #include "gdialog.h"
  
  static GobPlayer * g_player = NULL;

Index: gup.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/gup.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gup.cpp	17 Jan 2004 15:42:39 -0000	1.8
--- gup.cpp	29 Jan 2004 21:20:30 -0000	1.9
***************
*** 6,20 ****
  #endif
  
! #include "melee.h"
  REGISTER_FILE
! #include "melee/mframe.h"
! #include "melee/mship.h"
! #include "melee/mcbodies.h"
! #include "melee/mview.h"
! #include "frame.h"
! #include "sc1ships.h"
! #include "sc2ships.h"
! #include "games/ggob.h"
! #include "gup.h"
  
  /* this file contains the ship upgrades used by Gob */
--- 6,20 ----
  #endif
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../melee/mframe.h"
! #include "../melee/mship.h"
! #include "../melee/mcbodies.h"
! #include "../melee/mview.h"
! #include "../frame.h"
! #include "../sc1ships.h"
! #include "../sc2ships.h"
! #include "../games/ggob.h"
! #include "../other/gup.h"
  
  /* this file contains the ship upgrades used by Gob */

Index: gup.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/gup.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gup.h	10 Jan 2004 22:27:59 -0000	1.5
--- gup.h	29 Jan 2004 21:20:30 -0000	1.6
***************
*** 5,8 ****
--- 5,20 ----
  extern Upgrade **upgrade_list;
  
+ /*
+ This is the .h file for Gobs upgrades
+ 
+ They are kinda hardwired for working with Gob, but you might 
+ be able to get most of them to work for some other game type
+ */
+ 
+ class Upgrade;
+ 
+ extern Upgrade **upgrade_list;
+ 
+ 
  class UpgradeIndex {
  public:

Index: nullphas.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/nullphas.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** nullphas.cpp	13 Jan 2004 01:15:25 -0000	1.6
--- nullphas.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,5 ****
! #include "melee.h"
  REGISTER_FILE
! #include "melee/mgame.h"
  #include "nullphas.h"
  
--- 1,5 ----
! #include "../melee.h"
  REGISTER_FILE
! #include "../melee/mgame.h"
  #include "nullphas.h"
  

Index: nullphas.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/nullphas.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nullphas.h	13 Jan 2004 01:15:25 -0000	1.5
--- nullphas.h	29 Jan 2004 21:20:30 -0000	1.6
***************
*** 2,6 ****
  #define __NULLPHAS_H__
  
! #include "melee/mship.h"
  
  class NullPhaser : public Phaser {
--- 2,6 ----
  #define __NULLPHAS_H__
  
! #include "../melee/mship.h"
  
  class NullPhaser : public Phaser {

Index: objanim.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/objanim.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** objanim.cpp	13 Jan 2004 01:15:25 -0000	1.6
--- objanim.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,3 ****
! #include "melee.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "../melee.h"
  REGISTER_FILE
  

Index: objanim.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/objanim.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** objanim.h	13 Jan 2004 01:15:25 -0000	1.5
--- objanim.h	29 Jan 2004 21:20:30 -0000	1.6
***************
*** 2,7 ****
  #define __OBJANIM_H__
  
! #include "melee/mframe.h"
! #include "melee/manim.h"
  
  class ObjectAnimation : public Animation {
--- 2,7 ----
  #define __OBJANIM_H__
  
! #include "../melee/mframe.h"
! #include "../melee/manim.h"
  
  class ObjectAnimation : public Animation {

Index: orbit.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/orbit.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** orbit.cpp	13 Jan 2004 01:15:25 -0000	1.7
--- orbit.cpp	29 Jan 2004 21:20:30 -0000	1.8
***************
*** 1,16 ****
  #include <stdio.h>
  #include <allegro.h>
! #include "melee.h"
  REGISTER_FILE
! #include "id.h"
! #include "scp.h"
! #include "frame.h"
! #include "ship.h"
  
! #include "melee/mgame.h"
! #include "melee/mview.h"
! #include "melee/mcbodies.h"
! #include "melee/manim.h"
! #include "melee/mship.h"
  
  #include "orbit.h"
--- 1,16 ----
  #include <stdio.h>
  #include <allegro.h>
! #include "../melee.h"
  REGISTER_FILE
! #include "../id.h"
! #include "../scp.h"
! #include "../frame.h"
! #include "../ship.h"
  
! #include "../melee/mgame.h"
! #include "../melee/mview.h"
! #include "../melee/mcbodies.h"
! #include "../melee/manim.h"
! #include "../melee/mship.h"
  
  #include "orbit.h"

Index: planet3d.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/planet3d.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** planet3d.cpp	13 Jan 2004 01:15:25 -0000	1.15
--- planet3d.cpp	29 Jan 2004 21:20:30 -0000	1.16
***************
*** 10,19 ****
  */
  
! #include "ship.h"
  REGISTER_FILE
! #include "melee/mview.h"
  
! #include "util/pmask.h"
! #include "util/aastr.h"
  
  #include <stdio.h>
--- 10,19 ----
  */
  
! #include "../ship.h"
  REGISTER_FILE
! #include "../melee/mview.h"
  
! #include "../util/pmask.h"
! #include "../util/aastr.h"
  
  #include <stdio.h>

Index: planet3d.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/planet3d.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** planet3d.h	13 Jan 2004 01:15:25 -0000	1.3
--- planet3d.h	29 Jan 2004 21:20:30 -0000	1.4
***************
*** 3,7 ****
  
  
! #include "melee/mcbodies.h"
  
  
--- 3,7 ----
  
  
! #include "../melee/mcbodies.h"
  
  

Index: radar.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/radar.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** radar.cpp	13 Jan 2004 01:15:25 -0000	1.6
--- radar.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,15 ****
  #include <allegro.h>
! #include "melee.h"
  REGISTER_FILE
! #include "id.h"
! #include "scp.h"
! #include "frame.h"
! #include "ship.h"
  
! #include "melee/mgame.h"
! #include "melee/mview.h"
! #include "melee/mcbodies.h"
! #include "melee/manim.h"
! #include "melee/mship.h"
  
  #include "radar.h"
--- 1,15 ----
  #include <allegro.h>
! #include "../melee.h"
  REGISTER_FILE
! #include "../id.h"
! #include "../scp.h"
! #include "../frame.h"
! #include "../ship.h"
  
! #include "../melee/mgame.h"
! #include "../melee/mview.h"
! #include "../melee/mcbodies.h"
! #include "../melee/manim.h"
! #include "../melee/mship.h"
  
  #include "radar.h"

Index: radar.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/radar.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** radar.h	13 Jan 2004 01:15:25 -0000	1.5
--- radar.h	29 Jan 2004 21:20:30 -0000	1.6
***************
*** 2,20 ****
  #define __RADAR_H__
  
- #include <allegro.h>
- #include <stdio.h>
  
! #include "melee.h"
! #include "id.h"
! #include "scp.h"
! #include "frame.h"
  
! #include "melee/mgame.h"
! #include "melee/mview.h"
! #include "melee/mcbodies.h"
! #include "melee/manim.h"
! #include "melee/mship.h"
  
! #include "melee/mframe.h"
  
  class ZRadar : public Presence
--- 2,18 ----
  #define __RADAR_H__
  
  
! #include "../melee.h"
! #include "../id.h"
! #include "../scp.h"
! #include "../frame.h"
  
! #include "../melee/mgame.h"
! #include "../melee/mview.h"
! #include "../melee/mcbodies.h"
! #include "../melee/manim.h"
! #include "../melee/mship.h"
  
! #include "../melee/mframe.h"
  
  class ZRadar : public Presence

Index: shippart.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/shippart.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shippart.cpp	13 Jan 2004 01:15:25 -0000	1.9
--- shippart.cpp	29 Jan 2004 21:20:30 -0000	1.10
***************
*** 1,11 ****
  
  
! #include "ship.h"
! #include "melee/mview.h"
  REGISTER_FILE
  
  #include <stdio.h>
  
! #include "frame.h"
  
  #include "shippart.h"
--- 1,11 ----
  
  
! #include "../ship.h"
! #include "../melee/mview.h"
  REGISTER_FILE
  
  #include <stdio.h>
  
! #include "../frame.h"
  
  #include "shippart.h"

Index: shippart.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/shippart.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shippart.h	13 Jan 2004 01:15:25 -0000	1.8
--- shippart.h	29 Jan 2004 21:20:30 -0000	1.9
***************
*** 2,6 ****
  #define __SHIPPART__
  
! #include "ship.h"
  
  
--- 2,6 ----
  #define __SHIPPART__
  
! #include "../ship.h"
  
  

Index: vbodies.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/vbodies.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** vbodies.cpp	13 Jan 2004 01:15:25 -0000	1.10
--- vbodies.cpp	29 Jan 2004 21:20:30 -0000	1.11
***************
*** 4,25 ****
  #include <stdio.h>
  
- #include "vbodies.h"
- #include "util/vector2.h"
  
! 
! #include "melee.h"
  REGISTER_FILE
! #include "id.h"
! #include "scp.h"
! #include "frame.h"
  
! #include "melee/mgame.h"
! #include "melee/mview.h"
! #include "melee/mcbodies.h"
! #include "melee/manim.h"
! #include "melee/mship.h"
! #include "melee/mgame.h"
! #include "other/orbit.h"
! #include "other/vtarget.h"
  
  
--- 4,26 ----
  #include <stdio.h>
  
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../id.h"
! #include "../scp.h"
! #include "../frame.h"
  
! #include "vbodies.h"
! #include "../util/vector2.h"
! 
! 
! #include "../melee/mgame.h"
! #include "../melee/mview.h"
! #include "../melee/mcbodies.h"
! #include "../melee/manim.h"
! #include "../melee/mship.h"
! #include "../melee/mgame.h"
! #include "../other/orbit.h"
! #include "../other/vtarget.h"
  
  

Index: vbodies.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/vbodies.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** vbodies.h	13 Jan 2004 01:15:25 -0000	1.5
--- vbodies.h	29 Jan 2004 21:20:30 -0000	1.6
***************
*** 4,14 ****
  #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"
  
  SpaceSprite* _VGetSprite(char *fileName, char *spriteName, int attribs, int rotations);
--- 4,14 ----
  #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"
  
  SpaceSprite* _VGetSprite(char *fileName, char *spriteName, int attribs, int rotations);

Index: vtarget.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/vtarget.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** vtarget.cpp	13 Jan 2004 01:15:25 -0000	1.6
--- vtarget.cpp	29 Jan 2004 21:20:30 -0000	1.7
***************
*** 1,18 ****
- #include "ship.h"
- #include "frame.h"
- #include "vtarget.h"
  
! #include "melee.h"
  REGISTER_FILE
! #include "id.h"
  
! #include "libs.h"
  
! #include "melee/mframe.h"
! #include "melee/mgame.h"
! #include "melee/manim.h"
! #include "melee/mview.h"
! #include "melee/mship.h"
! #include "melee/mcbodies.h"
  
  //this file should be placed in the /other directory
--- 1,18 ----
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../id.h"
  
! //#include "../libs.h"
  
! #include "../melee/mframe.h"
! #include "../melee/mgame.h"
! #include "../melee/manim.h"
! #include "../melee/mview.h"
! #include "../melee/mship.h"
! #include "../melee/mcbodies.h"
! #include "../ship.h"
! #include "../frame.h"
! #include "vtarget.h"
  
  //this file should be placed in the /other directory

[Timewarp-commit] source/gamex/stuff backgr_stars.cpp,1.3,1.4 space_body.cpp,1.7,1.8 space_body.h,1.7,1.8

[<or...@pr...>]

Update of /cvsroot/timewarp/source/gamex/stuff
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source/gamex/stuff

Modified Files:
	backgr_stars.cpp space_body.cpp space_body.h 
Log Message:
fixed project files, 
removed include paths, 
removed second gup.h, 
and #ifdefed scp.cpps dependancy upon gamex stuff

Index: backgr_stars.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/stuff/backgr_stars.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** backgr_stars.cpp	13 Jan 2004 01:15:23 -0000	1.3
--- backgr_stars.cpp	29 Jan 2004 21:20:29 -0000	1.4
***************
*** 1,13 ****
  
! #include "melee.h"
  REGISTER_FILE
  
! #include "melee/mframe.h"
! #include "frame.h"
! #include "melee/mview.h"
  
  
  #include "backgr_stars.h"
! #include "general/sprites.h"
  
  
--- 1,13 ----
  
! #include "../../melee.h"
  REGISTER_FILE
  
! #include "../../melee/mframe.h"
! #include "../../frame.h"
! #include "../../melee/mview.h"
  
  
  #include "backgr_stars.h"
! #include "../general/sprites.h"
  
  

Index: space_body.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/stuff/space_body.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** space_body.cpp	13 Jan 2004 01:15:23 -0000	1.7
--- space_body.cpp	29 Jan 2004 21:20:29 -0000	1.8
***************
*** 1,12 ****
  #include <string.h>
  
! #include "melee.h"
  
  REGISTER_FILE
  
! #include "frame.h"
! #include "melee/mframe.h"
! #include "melee/mview.h"
! #include "melee/mitems.h"
  
  #include "space_body.h"
--- 1,12 ----
  #include <string.h>
  
! #include "../../melee.h"
  
  REGISTER_FILE
  
! #include "../../frame.h"
! #include "../../melee/mframe.h"
! #include "../../melee/mview.h"
! #include "../../melee/mitems.h"
  
  #include "space_body.h"

Index: space_body.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/stuff/space_body.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** space_body.h	13 Jan 2004 01:15:23 -0000	1.7
--- space_body.h	29 Jan 2004 21:20:29 -0000	1.8
***************
*** 2,6 ****
  #define __GAMEX_SPACE_BODY__
  
! #include "gamedata_map.h"
  
  // ellips of planet orbit
--- 2,6 ----
  #define __GAMEX_SPACE_BODY__
  
! #include "../gamedata_map.h"
  
  // ellips of planet orbit
***************
*** 10,17 ****
  void shadowpaintcircle(SpaceSprite *spr, double fi_s);
  
! #include "twgui/twpopup.h"
! #include "twgui/twbuttontypes.h"
! #include "gameproject.h"
! #include "gamedata.h"
  
  
--- 10,17 ----
  void shadowpaintcircle(SpaceSprite *spr, double fi_s);
  
! #include "../../twgui/twpopup.h"
! #include "../../twgui/twbuttontypes.h"
! #include "../gameproject.h"
! #include "../gamedata.h"
  
  

[Timewarp-commit] source/util errors.h,1.9,1.10 errors_c.c,1.5,1.6

[<or...@pr...>]

Update of /cvsroot/timewarp/source/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13941/source/util

Modified Files:
	errors.h errors_c.c 
Log Message:
improved tw_error() macro

Index: errors.h
===================================================================
RCS file: /cvsroot/timewarp/source/util/errors.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** errors.h	10 Jan 2004 22:27:58 -0000	1.9
--- errors.h	29 Jan 2004 21:35:16 -0000	1.10
***************
*** 86,92 ****
   */
  
! #	define tw_error _prep_error(__FILE__, __LINE__); _error
  	void error_handler ( const char *message);
  	extern void (*_error_handler) ( const char *src_file, int line, const char *message );
  	void _prep_error(const char *file, int line);
  	void _error(const char *format, ...);
--- 86,99 ----
   */
  
! #	define tw_error _prep_error_func(__FILE__, __LINE__)
! //#	define tw_error _prep_error(__FILE__, __LINE__); _error
  	void error_handler ( const char *message);
  	extern void (*_error_handler) ( const char *src_file, int line, const char *message );
+ #ifdef __cplusplus
+ 	typedef void (*ERROR_FUNC_TYPE)(const char *fmt = "", ...);
+ #else
+ 	typedef void (*ERROR_FUNC_TYPE)(const char *fmt, ...);
+ #endif
+ 	ERROR_FUNC_TYPE _prep_error_func ( const char *file, int line );
  	void _prep_error(const char *file, int line);
  	void _error(const char *format, ...);

Index: errors_c.c
===================================================================
RCS file: /cvsroot/timewarp/source/util/errors_c.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** errors_c.c	21 Nov 2003 10:24:29 -0000	1.5
--- errors_c.c	29 Jan 2004 21:35:17 -0000	1.6
***************
*** 15,25 ****
  
  
- // A helper function used by tw_error()
  static const char *_error_file = NULL;
  static int         _error_line = -1;
- void _prep_error(const char *file, int line) {
- 	_error_file = file;
- 	_error_line = line;
- }
  
  static void __error(const char *format, ...) {
--- 15,20 ----
***************
*** 42,45 ****
--- 37,51 ----
  }
  
+ // A helper function used by tw_error()
+ void _prep_error(const char *file, int line) {
+ 	_error_file = file;
+ 	_error_line = line;
+ }
+ //the new version of that helper function:
+ ERROR_FUNC_TYPE _prep_error_func ( const char *file, int line ) {
+ 	_prep_error(file, line);
+ 	return &__error;
+ }
+ 
  void _error(const char *format, ...) {
  	if (_error_line == -1) return;

[Timewarp-commit] docs WebpageDesign.txt,1.1,1.2

[<you...@pr...>]

Update of /cvsroot/timewarp/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30021/docs

Modified Files:
	WebpageDesign.txt 
Log Message:
updating website design docs.. dunno if it needed to be this complicated

Index: WebpageDesign.txt
===================================================================
RCS file: /cvsroot/timewarp/docs/WebpageDesign.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WebpageDesign.txt	20 Jan 2004 07:00:38 -0000	1.1
--- WebpageDesign.txt	29 Jan 2004 02:47:42 -0000	1.2
***************
*** 2,5 ****
--- 2,9 ----
    2004.01.20 youBastrd! started 
  
+ 
+ See: http://bugs.cs.iupui.edu/cgi-bin/bugzilla/show_bug.cgi?id=34
+ See: http://dynamic.gamespy.com/~timewarp/ikonboard/ikonboard.cgi?s=401174587edaffff;act=ST;f=13;t=36
+ 
  NOT DONE YET!
  
***************
*** 8,68 ****
  Needs:
  
! N1. Show the name of the project "Timewarp."  Show a short summary (one paragraph) of the game.  Show screenshots of what the game looks like.  
  
! N. Show technical overview of the game (2 player internet/LAN, multiplayer hot seat, gametypes).
  
! N2. Allow user to download the software.  Allow user to get the latest official release.  User should be able to download the latest official release within 1-3 clicks, the fewer clicks, the better.
  
! N. USer should be able to find quick solutions to common installation/compilation problems for all supported platforms. (FAQ?)
  
! N. Show credits for everyone that has participated in the project.  This list must be exhaustive in naming people.  Listing each participant's contribution may prove difficult.  Show things like contact info, active status, etc
  
! N. must link to forums.
  
! N. must link to saucecast.  
  
! N. must show news links.  any chance that these can be commented on in the forum?
  
! N. Must have banners required by GameSpy, ClassicGaming, Sourceforge
  
! N. Must have the following keywords in the text and in the head tag: Star Control, StarCon, Timewarp, Star Control 1, Star Control 2, Star Control 3, Ur-Quan Masters, Space Adventure Game
! N. 
! N. 
  
  Wants:
  
! W. Overview of the project's history.
  
- W. 
- W. 
- W. 
- W. 
- W. 
  
  Nice to Have:
  
! H: 
! H: 
! H: 
! H: 
! H: 
! H: 
! H: 
! H: 
  
! Solutions:
  
! S1. 
! S. 
! S. 
! S. 
! S. 
! S. 
! S. 
  
  
  
  
  
  
  
--- 12,97 ----
  Needs:
  
! N1. Show the name of the project "Timewarp" (!)in text(!).  Show a short summary (one paragraph) of the game.  Show screenshots of what the game looks like.  
  
! N2. Must show logo.
  
! N3. Show technical overview of the game (2 player internet/LAN, multiplayer hot seat, gametypes).
  
! N4. Allow user to download the software.  Allow user to get the latest official release.  User should be able to download the latest official release within 1-3 clicks, the fewer clicks, the better.
  
! N5. USer should be able to find quick solutions to common installation/compilation problems for all supported platforms. (FAQ?)
  
! N6. Show credits for everyone that has participated in the project.  This list must be exhaustive in naming people.  Listing each participant's contribution may prove difficult.  Show things like contact info, active status, etc
  
! N7. must link to forums.
  
! N8. must link to saucecast.  
  
! N9. must show news links.  any chance that these can be commented on in the forum?
  
! N10. Must have banners required by GameSpy, ClassicGaming, Sourceforge
! 
! N11. Must have the following keywords in the text and in the head tag: Star Control, StarCon, Timewarp, Star Control 1, Star Control 2, Star Control 3, Ur-Quan Masters, Space Adventure Game, ???
! 
! N12. must be compatible with all browsers, must be W3C HTML compliant.  Lynx compatible?
  
  Wants:
  
! W1. Overview of the project's history. 
! 
! W2. Detailed, exhastive version info for each version (going back to Sept 2001)
! 
! W3. Make it look really cool.
  
  
  Nice to Have:
  
! H1: RSS feeds for news items.
  
! H2: RSS feeds for new posts in the forums
  
! H1: Switch to another forum.  PHPBB is looking pretty good.  Consolidate all the other forums related to TW to this one new forum.  Preseve all content in the process.  Other forums include: Channel 44, http://dynamic.gamespy.com/~starcontrol/boards/timewarp/, all the team-specific boards.  
! 
! H3. If needed by specific teams, groups can be set up, and permissions set up for each group such that, for example, only Team Beige members can access the Team Beige forum.
! 
! 
! Solutions (Layouts):
! 
! S1. HTML + CSS
! 
! header (file named exactly "header")
! * this file is never really shown.  Instead, it gets inserted into each html file using a perl script, InsertMenu.pl.  This perl script is run off-line, whenever a change is made to any of the html pages.  This script has to be run manually.  It does not appear on the webpage on its own.  
! * meet W3
! 
! menu
! * this file is never really shown.  Instead, it gets inserted into each html file using a perl script, InsertMenu.pl.  This perl script is run off-line, whenever a change is made to any of the html pages.  This script has to be run manually.  It does not appear on the webpage on its own.  
! * meet N7 - 12
! * meet W3
! 
! footer (file named exactly "footer")
! * this file is never really shown.  Instead, it gets inserted into each html file using a perl script, InsertMenu.pl.  This perl script is run off-line, whenever a change is made to any of the html pages.  This script has to be run manually.  It does not appear on the webpage on its own.  
! * need W3
! 
! InsertMenu.pl (does not appear on the webpage)
! * perl script to insert menus, banners and a header into each html page.  Must be used manually.  
! * makes each html page use main.css
  
+ main.css
+ * declares a bunch of formatting stuff for many html tags.
+ * meet W3
  
+ index.html
+ * meet N1 - N4
+ * link to faq.html, history.html
  
+ download.html
+ * explains how to download TW. 
+ * links to the actual files on sourceforge.  Explains what each file is.
  
+ faq.html
+ * meet N5
  
+ history.html
+ * meet W1 - W2
  
  

[Timewarp-commit] source/melee manim.cpp,1.6,1.7 mcbodies.cpp,1.9,1.10 mcbodies.h,1.6,1.7 mcontrol.cpp,1.14,1.15 mcontrol.h,1.7,1.8 mfleet.cpp,1.19,1.20 mfleet.h,1.13,1.14 mframe.cpp,1.22,1.23 mgame.cpp,1.29,1.30 mitems.cpp,1.6,1.7 mitems.h,1.3,1.4 mlog.cpp,1.6,1.7 mmain.cpp,1.20,1.21 mmain.h,1.7,1.8 mmath.cpp,1.6,1.7 mnet1.cpp,1.7,1.8 mnet1.h,1.5,1.6 moptions.cpp,1.12,1.13 mship.cpp,1.24,1.25 mshot.cpp,1.13,1.14 mshpdata.cpp,1.6,1.7 mshppan.cpp,1.16,1.17 mshppan.h,1.8,1.9 msprite.cpp,1.13,1.14 mview.cpp,1.14,1.15 mview.h,1.5,1.6

[<or...@pr...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source/melee

Modified Files:
	manim.cpp mcbodies.cpp mcbodies.h mcontrol.cpp mcontrol.h 
	mfleet.cpp mfleet.h mframe.cpp mgame.cpp mitems.cpp mitems.h 
	mlog.cpp mmain.cpp mmain.h mmath.cpp mnet1.cpp mnet1.h 
	moptions.cpp mship.cpp mshot.cpp mshpdata.cpp mshppan.cpp 
	mshppan.h msprite.cpp mview.cpp mview.h 
Log Message:
fixed project files, 
removed include paths, 
removed second gup.h, 
and #ifdefed scp.cpps dependancy upon gamex stuff

Index: manim.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/manim.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** manim.cpp	25 Jan 2004 12:40:22 -0000	1.6
--- manim.cpp	29 Jan 2004 21:20:29 -0000	1.7
***************
*** 1,8 ****
  
! #include "util/aastr.h"
! #include "melee.h"
  REGISTER_FILE
  
! #include "ship.h"
  #include "mgame.h"
  #include "manim.h"
--- 1,8 ----
  
! #include "../melee.h"
  REGISTER_FILE
+ #include "../util/aastr.h"
  
! #include "../ship.h"
  #include "mgame.h"
  #include "manim.h"

Index: mcbodies.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcbodies.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mcbodies.cpp	17 Jan 2004 22:47:22 -0000	1.9
--- mcbodies.cpp	29 Jan 2004 21:20:29 -0000	1.10
***************
*** 3,11 ****
  #include <string.h>
  #include <stdio.h>
! #include "melee.h"
  REGISTER_FILE
! #include "id.h"
! #include "scp.h"
! #include "frame.h"
  
  #include "mgame.h"
--- 3,11 ----
  #include <string.h>
  #include <stdio.h>
! #include "../melee.h"
  REGISTER_FILE
! #include "../id.h"
! //#include "../scp.h"
! #include "../frame.h"
  
  #include "mgame.h"

Index: mcbodies.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcbodies.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mcbodies.h	13 Jan 2004 01:15:25 -0000	1.6
--- mcbodies.h	29 Jan 2004 21:20:29 -0000	1.7
***************
*** 3,7 ****
  #define __MCBODIES_H__
  
! #include "melee.h"
  #include "mframe.h"
  
--- 3,7 ----
  #define __MCBODIES_H__
  
! #include "../melee.h"
  #include "mframe.h"
  

Index: mcontrol.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcontrol.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** mcontrol.cpp	13 Jan 2004 01:15:25 -0000	1.14
--- mcontrol.cpp	29 Jan 2004 21:20:29 -0000	1.15
***************
*** 3,18 ****
  #include <allegro.h>
  
! #include "melee.h"
  REGISTER_FILE
! #include "ais.h"
! #include "id.h"
  
! #include "frame.h"
! #include "gui.h"
  
  #include "mnet1.h"
  #include "mview.h" //remove this
  #include "mfleet.h"
! #include "scp.h"
  
  
--- 3,18 ----
  #include <allegro.h>
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../ais.h"
! #include "../id.h"
  
! #include "../frame.h"
! #include "../gui.h"
  
  #include "mnet1.h"
  #include "mview.h" //remove this
  #include "mfleet.h"
! #include "../scp.h"
  
  

Index: mcontrol.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcontrol.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mcontrol.h	13 Jan 2004 01:15:25 -0000	1.7
--- mcontrol.h	29 Jan 2004 21:20:29 -0000	1.8
***************
*** 2,6 ****
  #define __MCONTROL_H__
  
! #include "melee.h"
  #include "mframe.h"
  #include "mship.h"
--- 2,6 ----
  #define __MCONTROL_H__
  
! #include "../melee.h"
  #include "mframe.h"
  #include "mship.h"

Index: mfleet.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mfleet.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** mfleet.cpp	25 Jan 2004 12:40:24 -0000	1.19
--- mfleet.cpp	29 Jan 2004 21:20:29 -0000	1.20
***************
*** 18,25 ****
  #include <allegro.h>
  
! #include "melee.h"
  REGISTER_FILE
  #include "mfleet.h"
! #include "util/net_tcp.h"
  
  #include <algorithm>
--- 18,25 ----
  #include <allegro.h>
  
! #include "../melee.h"
  REGISTER_FILE
  #include "mfleet.h"
! #include "../util/net_tcp.h"
  
  #include <algorithm>

Index: mfleet.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mfleet.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mfleet.h	13 Jan 2004 01:15:25 -0000	1.13
--- mfleet.h	29 Jan 2004 21:20:29 -0000	1.14
***************
*** 2,6 ****
  #define __MFLEET_H__
  
! #include "melee.h"
  
  class Fleet;
--- 2,6 ----
  #define __MFLEET_H__
  
! #include "../melee.h"
  
  class Fleet;

Index: mframe.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mframe.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** mframe.cpp	17 Jan 2004 22:47:23 -0000	1.22
--- mframe.cpp	29 Jan 2004 21:20:29 -0000	1.23
***************
*** 1,12 ****
  
! #include <allegro.h>
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
! #include "id.h"
! #include "frame.h"
! #include "libs.h"
! #include "util/aastr.h"
  
  #include "mframe.h"
--- 1,12 ----
  
! //#include <allegro.h>
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../id.h"
! #include "../frame.h"
! #include "../libs.h"
! #include "../util/aastr.h"
  
  #include "mframe.h"

Index: mgame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** mgame.cpp	25 Jan 2004 12:40:25 -0000	1.29
--- mgame.cpp	29 Jan 2004 21:20:29 -0000	1.30
***************
*** 24,36 ****
  #include <allegro.h>
  
! #include "melee.h"
  REGISTER_FILE
! #include "scp.h"
! #include "util/net_tcp.h"
! #include "util/history.h"
! #include "util/sounds.h"
! #include "util/get_time.h"
! #include "frame.h"
! #include "libs.h"
  
  #include "mframe.h"
--- 24,36 ----
  #include <allegro.h>
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../scp.h"
! #include "../util/net_tcp.h"
! #include "../util/history.h"
! #include "../util/sounds.h"
! #include "../util/get_time.h"
! #include "../frame.h"
! #include "../libs.h"
  
  #include "mframe.h"

Index: mitems.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mitems.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mitems.cpp	13 Jan 2004 01:15:25 -0000	1.6
--- mitems.cpp	29 Jan 2004 21:20:29 -0000	1.7
***************
*** 1,12 ****
  #include <allegro.h>
! #include "melee.h"
  REGISTER_FILE
  
  
! #include "frame.h"
  #include "mframe.h"
  #include "mview.h"
  #include "mitems.h"
  #include "mgame.h"
  
  
--- 1,97 ----
  #include <allegro.h>
! #include "../melee.h"
  REGISTER_FILE
  
  
! #include "../frame.h"
  #include "mframe.h"
  #include "mview.h"
  #include "mitems.h"
  #include "mgame.h"
+ #include "mship.h"
+ 
+ 
+ 
+ HealthBar::HealthBar(Ship *creator, int *toggle)
+ {
+ 	scale = 2.0;
+ 	bartoggle = toggle;
+ 	mother = creator;
+ }
+ 
+ void HealthBar::calculate()
+ {
+ 	STACKTRACE
+ 
+ 	if ( !(mother && mother->exists()) )
+ 	{
+ 		state = 0;
+ 		return;
+ 	}
+ 
+ }
+ 
+ 
+ void HealthBar::draw_bar(Ship *s, double yoffs, int len, double H, double fraction, int col1, int col2, Frame *space)
+ {
+ 	STACKTRACE
+ 
+ 	Vector2 center;
+ 	int d;
+ 
+ 	H = iround(H * space_zoom);
+ 	if (H < 1)
+ 		H = 1;			// minimum thickness.
+ 
+ 	len = iround(len * space_zoom);	// scale
+ 
+ 	center = corner(s->pos);	// scales and shifts onto screen coord. of the (center of the) ship
+ 
+ 	int ix, iy;
+ 	ix = iround(center.x - len/2);
+ 	iy = iround(center.y - (0.6 * s->size.y + H/2 + yoffs) * space_zoom);
+ 	
+ 	d = iround(len * fraction);
+ 
+ 	H -= 1;		// for plotting, pixel 0 also counts
+ 
+ 	if (ix > space->surface->w) return;
+ 	if (iy > space->surface->h) return;
+ 	if (ix+len < 0) return;
+ 	if (iy+H < 0) return;
+ 
+ 	if (d > 0)
+ 		rectfill(space->surface, ix, iy, ix+d-1, iy+(int)H, col1);
+ 	rectfill(space->surface, ix+d, iy, ix+len, iy+(int)H, col2);
+ 
+ 	space->add_box(ix, iy, ix+len, iy+H);
+ }
+ 
+ 
+ void HealthBar::animate(Frame *space)
+ {
+ 	STACKTRACE
+ 
+ 	if (!*bartoggle)
+ 		return;
+ 
+ 	if (mother->isInvisible())
+ 		return;
+ 
+ 	int H = 2;
+ 	double dy = 4;
+ 
+ 	if ((dy - H/2) * space_zoom < 1)
+ 		dy = H/2 + 1/space_zoom;
+ 
+ 
+ 	draw_bar(mother, -dy, iround(mother->crew_max * scale), H, mother->crew/mother->crew_max,
+ 		makecol(0, 255, 0), makecol(150, 0, 0), space);
+ 
+ 	draw_bar(mother,  dy, iround(mother->batt_max * scale), H, mother->batt/mother->batt_max,
+ 		makecol(255, 50, 50), makecol(150, 0, 0), space);
+ 
+ }
+ 
  
  

Index: mitems.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mitems.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mitems.h	8 Jun 2003 17:55:51 -0000	1.3
--- mitems.h	29 Jan 2004 21:20:29 -0000	1.4
***************
*** 1,3 ****
--- 1,16 ----
  
+ class HealthBar : public Presence
+ {
+ public:
+ 	double	scale;
+ 	int		*bartoggle;
+ 	Ship	*mother;
+ 
+ 	HealthBar(Ship *creator, int *toggle);
+ 	void calculate();
+ 	void animate(Frame *space);
+ 
+ 	void draw_bar(Ship *s, double yoffs, int len, double H, double fraction, int col1, int col2, Frame *space);
+ };
  
  class Indicator : public Presence {

Index: mlog.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mlog.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mlog.cpp	13 Jan 2004 01:15:25 -0000	1.6
--- mlog.cpp	29 Jan 2004 21:20:29 -0000	1.7
***************
*** 3,11 ****
  #include <allegro.h>
  
! #include "melee.h"
  
  #include "mlog.h"
  #include "mgame.h"
! #include "util/net_tcp.h"
  
  
--- 3,11 ----
  #include <allegro.h>
  
! #include "../melee.h"
  
  #include "mlog.h"
  #include "mgame.h"
! #include "../util/net_tcp.h"
  
  

Index: mmain.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mmain.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** mmain.cpp	25 Jan 2004 12:40:43 -0000	1.20
--- mmain.cpp	29 Jan 2004 21:20:29 -0000	1.21
***************
*** 6,12 ****
  #include <allegro.h>
  
! #include "melee.h"
  REGISTER_FILE
! #include "scp.h"
  
  
--- 6,13 ----
  #include <allegro.h>
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../scp.h"
! #include "../frame.h"
  
  
***************
*** 18,26 ****
  #include "mship.h"
  #include "mlog.h"
! #include "mnet1.h"
  #include "mitems.h"
  #include "mfleet.h"
  
! #include "games/gflmelee.h"
  
  
--- 19,28 ----
  #include "mship.h"
  #include "mlog.h"
! //#include "mnet1.h"
  #include "mitems.h"
  #include "mfleet.h"
  
! #include "../games/gflmelee.h"
! //#include "../other/radar.h"
  
  
***************
*** 420,424 ****
  	return;
  }
- #include "../other/radar.h"
  bool NormalGame::handle_key(int k)
  {
--- 422,425 ----

Index: mmain.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mmain.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mmain.h	13 Jan 2004 01:15:26 -0000	1.7
--- mmain.h	29 Jan 2004 21:20:29 -0000	1.8
***************
*** 2,6 ****
  #define __MMAIN_H__
  
! #include "melee.h"
  #include "mgame.h"
  
--- 2,6 ----
  #define __MMAIN_H__
  
! #include "../melee.h"
  #include "mgame.h"
  

Index: mmath.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mmath.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mmath.cpp	13 Jan 2004 01:15:26 -0000	1.6
--- mmath.cpp	29 Jan 2004 21:20:29 -0000	1.7
***************
*** 1,9 ****
  //#include <float.h>
  
! #include "melee.h"
  REGISTER_FILE
  #include "mview.h"
  
! #include "util/vector2.h"
  double atan3(double y, double x) {STACKTRACE
  	if (y == 0) {
--- 1,9 ----
  //#include <float.h>
  
! #include "../melee.h"
  REGISTER_FILE
  #include "mview.h"
  
! #include "../util/vector2.h"
  double atan3(double y, double x) {STACKTRACE
  	if (y == 0) {

Index: mnet1.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mnet1.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mnet1.cpp	13 Jan 2004 01:15:26 -0000	1.7
--- mnet1.cpp	29 Jan 2004 21:20:29 -0000	1.8
***************
*** 3,7 ****
  #include <string.h>
  #include <allegro.h>
! #include "melee.h"
  REGISTER_FILE
  #include "mnet1.h"
--- 3,7 ----
  #include <string.h>
  #include <allegro.h>
! #include "../melee.h"
  REGISTER_FILE
  #include "mnet1.h"
***************
*** 9,13 ****
  #include "mcontrol.h"
  //#include "mcbodies.h"
! #include "scp.h"
  
  GameEventMessage::GameEventMessage (const char *text)
--- 9,13 ----
  #include "mcontrol.h"
  //#include "mcbodies.h"
! #include "../scp.h"
  
  GameEventMessage::GameEventMessage (const char *text)

Index: mnet1.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mnet1.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mnet1.h	13 Jan 2004 01:15:26 -0000	1.5
--- mnet1.h	29 Jan 2004 21:20:29 -0000	1.6
***************
*** 3,7 ****
  
  #include "mmain.h"
! #include "util/net_tcp.h"
  #include "mlog.h"
  #include "mship.h"
--- 3,7 ----
  
  #include "mmain.h"
! #include "../util/net_tcp.h"
  #include "mlog.h"
  #include "mship.h"

Index: moptions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** moptions.cpp	13 Jan 2004 01:15:26 -0000	1.12
--- moptions.cpp	29 Jan 2004 21:20:29 -0000	1.13
***************
*** 4,14 ****
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
! #include "scp.h"
! #include "gui.h"
  
! #include "util/aastr.h"
  
  /*
--- 4,14 ----
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
! #include "../scp.h"
! #include "../gui.h"
  
! #include "../util/aastr.h"
  
  /*

Index: mship.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mship.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** mship.cpp	13 Jan 2004 01:15:26 -0000	1.24
--- mship.cpp	29 Jan 2004 21:20:29 -0000	1.25
***************
*** 15,22 ****
  #include <stdio.h>
  
! #include "melee.h"
  REGISTER_FILE
! #include "id.h"
! #include "frame.h"
  
  #include "mcbodies.h"
--- 15,22 ----
  #include <stdio.h>
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../id.h"
! #include "../frame.h"
  
  #include "mcbodies.h"

Index: mshot.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshot.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mshot.cpp	25 Jan 2004 12:40:44 -0000	1.13
--- mshot.cpp	29 Jan 2004 21:20:29 -0000	1.14
***************
*** 2,8 ****
  #include <allegro.h>
  
! #include "melee.h"
  REGISTER_FILE
! #include "id.h"
  #include "mgame.h"
  #include "mshot.h"
--- 2,8 ----
  #include <allegro.h>
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../id.h"
  #include "mgame.h"
  #include "mshot.h"

Index: mshpdata.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshpdata.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mshpdata.cpp	13 Jan 2004 01:15:26 -0000	1.6
--- mshpdata.cpp	29 Jan 2004 21:20:29 -0000	1.7
***************
*** 14,20 ****
  #include <allegro.h>
  
! #include "melee.h"
  REGISTER_FILE
! #include "util/aastr.h"
  
  
--- 14,20 ----
  #include <allegro.h>
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../util/aastr.h"
  
  

Index: mshppan.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshppan.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** mshppan.cpp	13 Jan 2004 01:15:26 -0000	1.16
--- mshppan.cpp	29 Jan 2004 21:20:29 -0000	1.17
***************
*** 2,6 ****
  #include <allegro.h>
  
! #include "melee.h"
  REGISTER_FILE
  #include "mgame.h"
--- 2,6 ----
  #include <allegro.h>
  
! #include "../melee.h"
  REGISTER_FILE
  #include "mgame.h"
***************
*** 8,13 ****
  #include "mship.h"
  #include "mview.h"
! #include "id.h"
! #include "util/aastr.h"
  
  int PANEL_WIDTH = 64;
--- 8,13 ----
  #include "mship.h"
  #include "mview.h"
! #include "../id.h"
! #include "../util/aastr.h"
  
  int PANEL_WIDTH = 64;

Index: mshppan.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshppan.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mshppan.h	13 Jan 2004 01:15:26 -0000	1.8
--- mshppan.h	29 Jan 2004 21:20:29 -0000	1.9
***************
*** 2,6 ****
  #define __MSHPPAN_H__
  
! #include "melee.h"
  
  extern int PANEL_WIDTH;
--- 2,6 ----
  #define __MSHPPAN_H__
  
! #include "../melee.h"
  
  extern int PANEL_WIDTH;

Index: msprite.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/msprite.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** msprite.cpp	13 Jan 2004 01:15:26 -0000	1.13
--- msprite.cpp	29 Jan 2004 21:20:29 -0000	1.14
***************
*** 7,17 ****
  
  
! #include "melee.h"
  REGISTER_FILE
! #include "libs.h"
! #include "util/pmask.h"
! #include "util/aastr.h"
! #include "frame.h"
! #include "scp.h"
  
  #include "mview.h"
--- 7,17 ----
  
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../libs.h"
! #include "../util/pmask.h"
! #include "../util/aastr.h"
! #include "../frame.h"
! #include "../scp.h"
  
  #include "mview.h"

Index: mview.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mview.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** mview.cpp	17 Jan 2004 22:47:23 -0000	1.14
--- mview.cpp	29 Jan 2004 21:20:29 -0000	1.15
***************
*** 6,13 ****
  
  
! #include "melee.h"
  REGISTER_FILE
! #include "scp.h"
! #include "frame.h"
  
  #include "mview.h"
--- 6,13 ----
  
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../scp.h"
! #include "../frame.h"
  
  #include "mview.h"
***************
*** 18,22 ****
  #include "mship.h"
  
! #include "util/aastr.h"
  
  int FULL_REDRAW = 0;
--- 18,22 ----
  #include "mship.h"
  
! #include "../util/aastr.h"
  
  int FULL_REDRAW = 0;

Index: mview.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mview.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mview.h	13 Jan 2004 01:15:26 -0000	1.5
--- mview.h	29 Jan 2004 21:20:29 -0000	1.6
***************
*** 2,6 ****
  #define __MVIEW_H__
  
! #include "melee.h"
  #include "mframe.h"
  
--- 2,6 ----
  #define __MVIEW_H__
  
! #include "../melee.h"
  #include "mframe.h"
  

[Timewarp-commit] source/games dialog.cpp,1.5,1.6 gamehierarchy.cpp,1.8,1.9 gamehierarchy.h,1.5,1.6 gastroid.cpp,1.7,1.8 gdebugonly.cpp,1.7,1.8 gflmelee.cpp,1.18,1.19 gflmelee.h,1.3,1.4 ggob.cpp,1.20,1.21 ggob.h,1.10,1.11 ghyper.cpp,1.8,1.9 gleague.cpp,1.8,1.9 gluagame.cpp,1.3,1.4 gmissions.cpp,1.21,1.22 gmissions_objects.cpp,1.7,1.8 gplanets.cpp,1.10,1.11 gplexplr.cpp,1.11,1.12 gplexplr.h,1.3,1.4 gplhuge.cpp,1.8,1.9 gsamp2.cpp,1.7,1.8 gsample.cpp,1.8,1.9 gsarena.cpp,1.9,1.10 gsolar.cpp,1.7,1.8 gtrug.cpp,1.6,1.7 gtrug.h,1.5,1.6 vanguard.cpp,1.11,1.12 vgGenSys.cpp,1.8,1.9

[<or...@pr...>]

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source/games

Modified Files:
	dialog.cpp gamehierarchy.cpp gamehierarchy.h gastroid.cpp 
	gdebugonly.cpp gflmelee.cpp gflmelee.h ggob.cpp ggob.h 
	ghyper.cpp gleague.cpp gluagame.cpp gmissions.cpp 
	gmissions_objects.cpp gplanets.cpp gplexplr.cpp gplexplr.h 
	gplhuge.cpp gsamp2.cpp gsample.cpp gsarena.cpp gsolar.cpp 
	gtrug.cpp gtrug.h vanguard.cpp vgGenSys.cpp 
Log Message:
fixed project files, 
removed include paths, 
removed second gup.h, 
and #ifdefed scp.cpps dependancy upon gamex stuff

Index: dialog.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/dialog.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dialog.cpp	17 Jan 2004 15:42:39 -0000	1.5
--- dialog.cpp	29 Jan 2004 21:20:27 -0000	1.6
***************
*** 14,19 ****
  
  #include "dialog.h"
! #include "util/aautil.h"
! #include "util/aastr.h"
  
  BITMAP* Dialog::btmAlien   = NULL;
--- 14,19 ----
  
  #include "dialog.h"
! #include "../util/aautil.h"
! #include "../util/aastr.h"
  
  BITMAP* Dialog::btmAlien   = NULL;

Index: gamehierarchy.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gamehierarchy.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gamehierarchy.cpp	13 Jan 2004 01:15:23 -0000	1.8
--- gamehierarchy.cpp	29 Jan 2004 21:20:27 -0000	1.9
***************
*** 3,7 ****
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
--- 3,7 ----
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  

Index: gamehierarchy.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/gamehierarchy.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gamehierarchy.h	13 Jan 2004 01:15:23 -0000	1.5
--- gamehierarchy.h	29 Jan 2004 21:20:27 -0000	1.6
***************
*** 2,6 ****
  #define __GAMEHIERARCHY_H__
  
! #include "melee/mgame.h"
  
  /*
--- 2,6 ----
  #define __GAMEHIERARCHY_H__
  
! #include "../melee/mgame.h"
  
  /*

Index: gastroid.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gastroid.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gastroid.cpp	13 Jan 2004 01:15:23 -0000	1.7
--- gastroid.cpp	29 Jan 2004 21:20:27 -0000	1.8
***************
*** 1,11 ****
  #include <allegro.h>
  
! #include "melee.h"
  
! #include "melee/mframe.h"
! #include "melee/mgame.h"
! #include "melee/mmain.h"
! #include "melee/mcbodies.h"
! #include "melee/mview.h"
  
  class AsteroidMelee : public NormalGame {
--- 1,11 ----
  #include <allegro.h>
  
! #include "../melee.h"
  
! #include "../melee/mframe.h"
! #include "../melee/mgame.h"
! #include "../melee/mmain.h"
! #include "../melee/mcbodies.h"
! #include "../melee/mview.h"
  
  class AsteroidMelee : public NormalGame {

Index: gdebugonly.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gdebugonly.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gdebugonly.cpp	13 Jan 2004 01:15:23 -0000	1.7
--- gdebugonly.cpp	29 Jan 2004 21:20:27 -0000	1.8
***************
*** 4,14 ****
  #include <allegro.h>
  
! #include "melee.h"
  
! #include "melee/mframe.h"
! #include "melee/mgame.h"
! #include "melee/mmain.h"
! #include "melee/mcbodies.h"
! #include "melee/mview.h"
  
  static bool animtoggle = 0;
--- 4,14 ----
  #include <allegro.h>
  
! #include "../melee.h"
  
! #include "../melee/mframe.h"
! #include "../melee/mgame.h"
! #include "../melee/mmain.h"
! #include "../melee/mcbodies.h"
! #include "../melee/mview.h"
  
  static bool animtoggle = 0;

Index: gflmelee.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gflmelee.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** gflmelee.cpp	13 Jan 2004 01:15:23 -0000	1.18
--- gflmelee.cpp	29 Jan 2004 21:20:27 -0000	1.19
***************
*** 27,49 ****
  #include <stdio.h>
  #include <string.h>
! #include "melee.h"
! #include "other/radar.h"
! #include "melee/mshppan.h"
  
  REGISTER_FILE
! #include "melee/mframe.h"
! #include "melee/mgame.h"
! #include "melee/mmain.h"
! #include "melee/mcbodies.h"
! #include "melee/mview.h"
! #include "other/orbit.h"
! #include "melee/mitems.h"
! #include "util/aastr.h"
! #include "melee/mcontrol.h"
  //#define STATION_LOG
  
  #include "gflmelee.h"
  
! #include "melee/mlog.h"
  
  
--- 27,49 ----
  #include <stdio.h>
  #include <string.h>
! #include "../melee.h"
! #include "../other/radar.h"
! #include "../melee/mshppan.h"
  
  REGISTER_FILE
! #include "../melee/mframe.h"
! #include "../melee/mgame.h"
! #include "../melee/mmain.h"
! #include "../melee/mcbodies.h"
! #include "../melee/mview.h"
! #include "../other/orbit.h"
! #include "../melee/mitems.h"
! #include "../util/aastr.h"
! #include "../melee/mcontrol.h"
  //#define STATION_LOG
  
  #include "gflmelee.h"
  
! #include "../melee/mlog.h"
  
  
***************
*** 224,309 ****
  
  
- HealthBar::HealthBar(Ship *creator, int *toggle)
- {
- 	scale = 2.0;
- 	bartoggle = toggle;
- 	mother = creator;
- }
- 
- void HealthBar::calculate()
- {
- 	STACKTRACE
- 
- 	if ( !(mother && mother->exists()) )
- 	{
- 		state = 0;
- 		return;
- 	}
- 
- }
- 
- 
- void HealthBar::draw_bar(Ship *s, double yoffs, int len, double H, double fraction, int col1, int col2, Frame *space)
- {
- 	STACKTRACE
- 
- 	Vector2 center;
- 	int d;
- 
- 	H = iround(H * space_zoom);
- 	if (H < 1)
- 		H = 1;			// minimum thickness.
- 
- 	len = iround(len * space_zoom);	// scale
- 
- 	center = corner(s->pos);	// scales and shifts onto screen coord. of the (center of the) ship
- 
- 	int ix, iy;
- 	ix = iround(center.x - len/2);
- 	iy = iround(center.y - (0.6 * s->size.y + H/2 + yoffs) * space_zoom);
- 	
- 	d = iround(len * fraction);
- 
- 	H -= 1;		// for plotting, pixel 0 also counts
- 
- 	if (ix > space->surface->w) return;
- 	if (iy > space->surface->h) return;
- 	if (ix+len < 0) return;
- 	if (iy+H < 0) return;
- 
- 	if (d > 0)
- 		rectfill(space->surface, ix, iy, ix+d-1, iy+(int)H, col1);
- 	rectfill(space->surface, ix+d, iy, ix+len, iy+(int)H, col2);
- 
- 	space->add_box(ix, iy, ix+len, iy+H);
- }
- 
- 
- void HealthBar::animate(Frame *space)
- {
- 	STACKTRACE
- 
- 	if (!*bartoggle)
- 		return;
- 
- 	if (mother->isInvisible())
- 		return;
- 
- 	int H = 2;
- 	double dy = 4;
- 
- 	if ((dy - H/2) * space_zoom < 1)
- 		dy = H/2 + 1/space_zoom;
- 
- 
- 	draw_bar(mother, -dy, iround(mother->crew_max * scale), H, mother->crew/mother->crew_max,
- 		makecol(0, 255, 0), makecol(150, 0, 0), space);
- 
- 	draw_bar(mother,  dy, iround(mother->batt_max * scale), H, mother->batt/mother->batt_max,
- 		makecol(255, 50, 50), makecol(150, 0, 0), space);
- 
- }
- 
- 
  
  SpaceSprite *FlMelee::GetSprite(char *fileName, char *spriteName, int attribs)
--- 224,227 ----

Index: gflmelee.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/gflmelee.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gflmelee.h	10 Jan 2004 22:27:59 -0000	1.3
--- gflmelee.h	29 Jan 2004 21:20:27 -0000	1.4
***************
*** 2,19 ****
  #define __GFLMELEE_H__
  
- class HealthBar : public Presence
- {
- public:
- 	double	scale;
- 	int		*bartoggle;
- 	Ship	*mother;
- 
- 	HealthBar(Ship *creator, int *toggle);
- 	void calculate();
- 	void animate(Frame *space);
- 
- 	void draw_bar(Ship *s, double yoffs, int len, double H, double fraction, int col1, int col2, Frame *space);
- };
- 
  
  class ShipPanelBmp : public Presence {
--- 2,5 ----

Index: ggob.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ggob.cpp	24 Jan 2004 21:04:05 -0000	1.20
--- ggob.cpp	29 Jan 2004 21:20:27 -0000	1.21
***************
*** 10,37 ****
  #endif
  
! #include "melee.h"
  REGISTER_FILE
! #include "scp.h"
! #include "frame.h"
  
! #include "melee/mgame.h"
! #include "melee/mmain.h"
! #include "melee/mview.h"
! #include "melee/mcontrol.h"
! #include "melee/mcbodies.h"
! #include "melee/mshppan.h"
! #include "melee/mship.h"
! #include "melee/mshot.h"
! #include "melee/mlog.h"
! #include "melee/manim.h"
! #include "melee/mfleet.h"
  
! #include "util/aastr.h"
  
  #include "ggob.h"
! #include "sc1ships.h"
! #include "sc2ships.h"
  
! #include "other/gup.h"
  
  
--- 10,37 ----
  #endif
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../scp.h"
! #include "../frame.h"
  
! #include "../melee/mgame.h"
! #include "../melee/mmain.h"
! #include "../melee/mview.h"
! #include "../melee/mcontrol.h"
! #include "../melee/mcbodies.h"
! #include "../melee/mshppan.h"
! #include "../melee/mship.h"
! #include "../melee/mshot.h"
! #include "../melee/mlog.h"
! #include "../melee/manim.h"
! #include "../melee/mfleet.h"
  
! #include "../util/aastr.h"
  
  #include "ggob.h"
! #include "../sc1ships.h"
! #include "../sc2ships.h"
  
! #include "../other/gup.h"
  
  

Index: ggob.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ggob.h	24 Jan 2004 21:04:46 -0000	1.10
--- ggob.h	29 Jan 2004 21:20:28 -0000	1.11
***************
*** 4,16 ****
  #include <list>
  
! #include "melee.h"
! #include "melee/mframe.h"
! #include "melee/mgame.h"
  
! #include "melee/mitems.h"
! #include "melee/mcbodies.h"
  
! #include "other/gquest.h"
! #include "other/gevent.h"
  
  class Upgrade;
--- 4,16 ----
  #include <list>
  
! #include "../melee.h"
! #include "../melee/mframe.h"
! #include "../melee/mgame.h"
  
! #include "../melee/mitems.h"
! #include "../melee/mcbodies.h"
  
! #include "../other/gquest.h"
! #include "../other/gevent.h"
  
  class Upgrade;

Index: ghyper.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/ghyper.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ghyper.cpp	13 Jan 2004 01:15:23 -0000	1.8
--- ghyper.cpp	29 Jan 2004 21:20:28 -0000	1.9
***************
*** 1,13 ****
  #include <allegro.h>
  
! #include "melee.h"
! #include "frame.h"
  
! #include "melee/mframe.h"
! #include "melee/mgame.h"
! #include "melee/mmain.h"
! #include "melee/mview.h"
! #include "melee/mcbodies.h"
! #include "melee/mshot.h"
  
  void HyperspaceColorEffects (RGB *c) {
--- 1,13 ----
  #include <allegro.h>
  
! #include "../melee.h"
! #include "../frame.h"
  
! #include "../melee/mframe.h"
! #include "../melee/mgame.h"
! #include "../melee/mmain.h"
! #include "../melee/mview.h"
! #include "../melee/mcbodies.h"
! #include "../melee/mshot.h"
  
  void HyperspaceColorEffects (RGB *c) {

Index: gleague.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gleague.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gleague.cpp	13 Jan 2004 01:15:23 -0000	1.8
--- gleague.cpp	29 Jan 2004 21:20:28 -0000	1.9
***************
*** 2,17 ****
  #include <allegro.h>
  
! #include "melee.h"
! #include "id.h"
! #include "frame.h"
! #include "scp.h"
  
! #include "melee/mframe.h"
! #include "melee/mgame.h"
! #include "melee/mmain.h"
! #include "melee/mship.h"
! #include "melee/mshot.h"
! #include "melee/mview.h"
! #include "melee/mcbodies.h"
  
  #define LEAGUE_BALL_MASS         3
--- 2,17 ----
  #include <allegro.h>
  
! #include "../melee.h"
! #include "../id.h"
! #include "../frame.h"
! #include "../scp.h"
  
! #include "../melee/mframe.h"
! #include "../melee/mgame.h"
! #include "../melee/mmain.h"
! #include "../melee/mship.h"
! #include "../melee/mshot.h"
! #include "../melee/mview.h"
! #include "../melee/mcbodies.h"
  
  #define LEAGUE_BALL_MASS         3

Index: gluagame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gluagame.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gluagame.cpp	14 Jan 2004 07:41:57 -0000	1.3
--- gluagame.cpp	29 Jan 2004 21:20:28 -0000	1.4
***************
*** 8,24 ****
  #include <allegro.h> //allegro library header
  
! #include "melee.h"          //used by all TW source files.  well, mostly.  
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "melee/mgame.h"    //Game stuff
! #include "melee/mcbodies.h" //asteroids & planets
! #include "melee/mship.h"    //ships
! #include "melee/mlog.h"     //networking / demo recording / demo playback
! #include "melee/mcontrol.h" //controllers & AIs
! #include "melee/mview.h"    //Views & text messages
! #include "melee/mshppan.h"  //ship panels...
! #include "melee/mitems.h"   //indicators...
! #include "melee/mfleet.h"   //fleets...
  
! #include "melee/manim.h"
  
  extern "C" {
--- 8,24 ----
  #include <allegro.h> //allegro library header
  
! #include "../melee.h"          //used by all TW source files.  well, mostly.  
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "../melee/mgame.h"    //Game stuff
! #include "../melee/mcbodies.h" //asteroids & planets
! #include "../melee/mship.h"    //ships
! #include "../melee/mlog.h"     //networking / demo recording / demo playback
! #include "../melee/mcontrol.h" //controllers & AIs
! #include "../melee/mview.h"    //Views & text messages
! #include "../melee/mshppan.h"  //ship panels...
! #include "../melee/mitems.h"   //indicators...
! #include "../melee/mfleet.h"   //fleets...
  
! #include "../melee/manim.h"
  
  extern "C" {

Index: gmissions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gmissions.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** gmissions.cpp	13 Jan 2004 01:15:23 -0000	1.21
--- gmissions.cpp	29 Jan 2004 21:20:28 -0000	1.22
***************
*** 3,26 ****
  #include <allegro.h> //allegro library header
  
! #include "melee.h"          //used by all TW source files.  well, mostly.  
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "melee/mgame.h"    //Game stuff
! #include "melee/mcbodies.h" //asteroids & planets
! #include "melee/mship.h"    //ships
! #include "melee/mlog.h"     //networking / demo recording / demo playback
! #include "melee/mcontrol.h" //controllers & AIs
! #include "melee/mview.h"    //Views & text messages
! #include "melee/mshppan.h"  //ship panels...
! #include "melee/mitems.h"   //indicators...
! #include "melee/mfleet.h"   //fleets...
  
! #include "melee/manim.h"
! #include "frame.h"
! #include "ais.h"
  
  #include "gamehierarchy.h"
  
! #include "twgui/twgui.h"
! #include "twgui/twmenuexamples.h"
  
  #include "gflmelee.h"
--- 3,26 ----
  #include <allegro.h> //allegro library header
  
! #include "../melee.h"          //used by all TW source files.  well, mostly.  
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "../melee/mgame.h"    //Game stuff
! #include "../melee/mcbodies.h" //asteroids & planets
! #include "../melee/mship.h"    //ships
! #include "../melee/mlog.h"     //networking / demo recording / demo playback
! #include "../melee/mcontrol.h" //controllers & AIs
! #include "../melee/mview.h"    //Views & text messages
! #include "../melee/mshppan.h"  //ship panels...
! #include "../melee/mitems.h"   //indicators...
! #include "../melee/mfleet.h"   //fleets...
  
! #include "../melee/manim.h"
! #include "../frame.h"
! #include "../ais.h"
  
  #include "gamehierarchy.h"
  
! #include "../twgui/twgui.h"
! #include "../twgui/twmenuexamples.h"
  
  #include "gflmelee.h"

Index: gmissions_objects.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gmissions_objects.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gmissions_objects.cpp	13 Jan 2004 01:15:24 -0000	1.7
--- gmissions_objects.cpp	29 Jan 2004 21:20:28 -0000	1.8
***************
*** 2,23 ****
  #include <allegro.h> //allegro library header
  
! #include "melee.h"          //used by all TW source files.  well, mostly.  
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "melee/mgame.h"    //Game stuff
! #include "melee/mcbodies.h" //asteroids & planets
! #include "melee/mship.h"    //ships
! #include "melee/mlog.h"     //networking / demo recording / demo playback
! #include "melee/mcontrol.h" //controllers & AIs
! #include "melee/mview.h"    //Views & text messages
! #include "melee/mshppan.h"  //ship panels...
! #include "melee/mitems.h"   //indicators...
! #include "melee/mfleet.h"   //fleets...
  
! #include "melee/manim.h"
! #include "frame.h"
! #include "util/aastr.h"
  
  
! #include "twgui/twgui.h"
  
  #include "gmissions_objects.h"
--- 2,23 ----
  #include <allegro.h> //allegro library header
  
! #include "../melee.h"          //used by all TW source files.  well, mostly.  
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "../melee/mgame.h"    //Game stuff
! #include "../melee/mcbodies.h" //asteroids & planets
! #include "../melee/mship.h"    //ships
! #include "../melee/mlog.h"     //networking / demo recording / demo playback
! #include "../melee/mcontrol.h" //controllers & AIs
! #include "../melee/mview.h"    //Views & text messages
! #include "../melee/mshppan.h"  //ship panels...
! #include "../melee/mitems.h"   //indicators...
! #include "../melee/mfleet.h"   //fleets...
  
! #include "../melee/manim.h"
! #include "../frame.h"
! #include "../util/aastr.h"
  
  
! #include "../twgui/twgui.h"
  
  #include "gmissions_objects.h"

Index: gplanets.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gplanets.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gplanets.cpp	13 Jan 2004 01:15:24 -0000	1.10
--- gplanets.cpp	29 Jan 2004 21:20:28 -0000	1.11
***************
*** 18,37 ****
  
  
! #include "melee.h"
  REGISTER_FILE
! #include "melee/mgame.h"
! #include "melee/mcbodies.h"
! #include "melee/mship.h"    //ships
! #include "melee/mlog.h"     //networking / demo recording / demo playback
! #include "melee/mcontrol.h" //controllers & AIs
! #include "melee/mframe.h"
! #include "melee/mview.h"
! #include "melee/mmain.h"
! #include "melee/mshppan.h"  //ship panels...
! #include "melee/mitems.h"
! #include "melee/mfleet.h"   //fleets...
  
! #include "other/orbit.h"
! #include "id.h"
  //#define STATION_LOG
  
--- 18,37 ----
  
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../melee/mgame.h"
! #include "../melee/mcbodies.h"
! #include "../melee/mship.h"    //ships
! #include "../melee/mlog.h"     //networking / demo recording / demo playback
! #include "../melee/mcontrol.h" //controllers & AIs
! #include "../melee/mframe.h"
! #include "../melee/mview.h"
! #include "../melee/mmain.h"
! #include "../melee/mshppan.h"  //ship panels...
! #include "../melee/mitems.h"
! #include "../melee/mfleet.h"   //fleets...
  
! #include "../other/orbit.h"
! #include "../id.h"
  //#define STATION_LOG
  

Index: gplexplr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gplexplr.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gplexplr.cpp	17 Jan 2004 22:47:22 -0000	1.11
--- gplexplr.cpp	29 Jan 2004 21:20:28 -0000	1.12
***************
*** 11,29 ****
  #include <allegro.h> //allegro library header
  
! #include "melee.h"          //used by all TW source files.  well, mostly.  
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "melee/mgame.h"    //Game stuff
! #include "melee/mcbodies.h" //asteroids & planets
! #include "melee/mship.h"    //ships
! #include "melee/mlog.h"     //networking / demo recording / demo playback
! #include "melee/mcontrol.h" //controllers & AIs
! #include "melee/mview.h"    //Views & text messages
! #include "melee/mshppan.h"  //ship panels...
! #include "melee/mitems.h"   //indicators...
! #include "melee/mfleet.h"   //fleets...
! #include "frame.h"
! #include "id.h"
  
! #include "melee/mshot.h"
  
  #include "gplexplr.h"
--- 11,29 ----
  #include <allegro.h> //allegro library header
  
! #include "../melee.h"          //used by all TW source files.  well, mostly.  
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "../melee/mgame.h"    //Game stuff
! #include "../melee/mcbodies.h" //asteroids & planets
! #include "../melee/mship.h"    //ships
! #include "../melee/mlog.h"     //networking / demo recording / demo playback
! #include "../melee/mcontrol.h" //controllers & AIs
! #include "../melee/mview.h"    //Views & text messages
! #include "../melee/mshppan.h"  //ship panels...
! #include "../melee/mitems.h"   //indicators...
! #include "../melee/mfleet.h"   //fleets...
! #include "../frame.h"
! #include "../id.h"
  
! #include "../melee/mshot.h"
  
  #include "gplexplr.h"

Index: gplexplr.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/gplexplr.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gplexplr.h	13 Jan 2004 01:15:24 -0000	1.3
--- gplexplr.h	29 Jan 2004 21:20:28 -0000	1.4
***************
*** 4,9 ****
  
  
! #include "melee/mgame.h"    //Game stuff
! #include "melee/mview.h"    //Views & text messages
  
  #include <stdio.h>
--- 4,9 ----
  
  
! #include "../melee/mgame.h"    //Game stuff
! #include "../melee/mview.h"    //Views & text messages
  
  #include <stdio.h>

Index: gplhuge.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gplhuge.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gplhuge.cpp	13 Jan 2004 01:15:24 -0000	1.8
--- gplhuge.cpp	29 Jan 2004 21:20:28 -0000	1.9
***************
*** 6,20 ****
  #include <allegro.h>
  #include <stdio.h>
! #include "melee.h"
  
  REGISTER_FILE
! #include "melee/mframe.h"
! #include "melee/mgame.h"
! #include "melee/mmain.h"
! #include "melee/mcbodies.h"
! #include "melee/mview.h"
! #include "other/orbit.h"
! #include "melee/mitems.h"
! #include "util/aastr.h"
  //#define STATION_LOG
  
--- 6,20 ----
  #include <allegro.h>
  #include <stdio.h>
! #include "../melee.h"
  
  REGISTER_FILE
! #include "../melee/mframe.h"
! #include "../melee/mgame.h"
! #include "../melee/mmain.h"
! #include "../melee/mcbodies.h"
! #include "../melee/mview.h"
! #include "../other/orbit.h"
! #include "../melee/mitems.h"
! #include "../util/aastr.h"
  //#define STATION_LOG
  

Index: gsamp2.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gsamp2.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gsamp2.cpp	13 Jan 2004 01:15:24 -0000	1.7
--- gsamp2.cpp	29 Jan 2004 21:20:28 -0000	1.8
***************
*** 26,42 ****
  #include <allegro.h> //allegro library header
  
! #include "melee.h"          //used by all TW source files.  well, mostly.  
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "melee/mgame.h"    //Game stuff
! #include "melee/mcbodies.h" //asteroids & planets
! #include "melee/mship.h"    //ships
! #include "melee/mshot.h"   //shots, missiles, lasers
! #include "melee/mlog.h"     //networking / demo recording / demo playback
! #include "melee/mcontrol.h" //controllers & AIs
! #include "melee/mview.h"    //Views & messages
! #include "melee/mshppan.h"  //ship panels...
  
! #include "melee/mitems.h"  //ship panels...
! #include "melee/manim.h"  //ship panels...
  
  
--- 26,42 ----
  #include <allegro.h> //allegro library header
  
! #include "../melee.h"          //used by all TW source files.  well, mostly.  
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "../melee/mgame.h"    //Game stuff
! #include "../melee/mcbodies.h" //asteroids & planets
! #include "../melee/mship.h"    //ships
! #include "../melee/mshot.h"   //shots, missiles, lasers
! #include "../melee/mlog.h"     //networking / demo recording / demo playback
! #include "../melee/mcontrol.h" //controllers & AIs
! #include "../melee/mview.h"    //Views & messages
! #include "../melee/mshppan.h"  //ship panels...
  
! #include "../melee/mitems.h"  //ship panels...
! #include "../melee/manim.h"  //ship panels...
  
  

Index: gsample.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gsample.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gsample.cpp	13 Jan 2004 01:15:24 -0000	1.8
--- gsample.cpp	29 Jan 2004 21:20:28 -0000	1.9
***************
*** 20,34 ****
  #include <allegro.h> //allegro library header
  
! #include "melee.h"          //used by all TW source files.  well, mostly.  
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "melee/mgame.h"    //Game stuff
! #include "melee/mcbodies.h" //asteroids & planets
! #include "melee/mship.h"    //ships
! #include "melee/mlog.h"     //networking / demo recording / demo playback
! #include "melee/mcontrol.h" //controllers & AIs
! #include "melee/mview.h"    //Views & text messages
! #include "melee/mshppan.h"  //ship panels...
! #include "melee/mitems.h"   //indicators...
! #include "melee/mfleet.h"   //fleets...
  
  
--- 20,34 ----
  #include <allegro.h> //allegro library header
  
! #include "../melee.h"          //used by all TW source files.  well, mostly.  
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "../melee/mgame.h"    //Game stuff
! #include "../melee/mcbodies.h" //asteroids & planets
! #include "../melee/mship.h"    //ships
! #include "../melee/mlog.h"     //networking / demo recording / demo playback
! #include "../melee/mcontrol.h" //controllers & AIs
! #include "../melee/mview.h"    //Views & text messages
! #include "../melee/mshppan.h"  //ship panels...
! #include "../melee/mitems.h"   //indicators...
! #include "../melee/mfleet.h"   //fleets...
  
  

Index: gsarena.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gsarena.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gsarena.cpp	13 Jan 2004 01:15:24 -0000	1.9
--- gsarena.cpp	29 Jan 2004 21:20:28 -0000	1.10
***************
*** 2,17 ****
  #include <stdio.h>
  
! #include "melee.h"          //used by all TW source files.  well, mostly.
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "melee/mgame.h"    //Game stuff
! #include "melee/mcbodies.h" //asteroids & planets
! #include "melee/mship.h"    //ships
! #include "melee/mlog.h"     //networking / demo recording / demo playback
! #include "melee/mcontrol.h" //controllers & AIs
! #include "melee/mview.h"    //Views & messages
! #include "melee/mshppan.h"  //ship panels...
! #include "melee/mitems.h"  //ship panels...
! #include "melee/mfleet.h"
! #include "other/orbit.h"
  
  class SuperArena : public Game { //declaring our game type
--- 2,17 ----
  #include <stdio.h>
  
! #include "../melee.h"          //used by all TW source files.  well, mostly.
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "../melee/mgame.h"    //Game stuff
! #include "../melee/mcbodies.h" //asteroids & planets
! #include "../melee/mship.h"    //ships
! #include "../melee/mlog.h"     //networking / demo recording / demo playback
! #include "../melee/mcontrol.h" //controllers & AIs
! #include "../melee/mview.h"    //Views & messages
! #include "../melee/mshppan.h"  //ship panels...
! #include "../melee/mitems.h"  //ship panels...
! #include "../melee/mfleet.h"
! #include "../other/orbit.h"
  
  class SuperArena : public Game { //declaring our game type

Index: gsolar.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gsolar.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gsolar.cpp	13 Jan 2004 01:15:24 -0000	1.7
--- gsolar.cpp	29 Jan 2004 21:20:28 -0000	1.8
***************
*** 2,14 ****
  #include <stdio.h>
  
! #include "melee.h"
  REGISTER_FILE
! #include "melee/mframe.h"
! #include "melee/mgame.h"
! #include "melee/mmain.h"
! #include "melee/mcbodies.h"
! #include "melee/mview.h"
! #include "other/orbit.h"
! #include "ship.h"
  #define STATION_LOG
  
--- 2,14 ----
  #include <stdio.h>
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../melee/mframe.h"
! #include "../melee/mgame.h"
! #include "../melee/mmain.h"
! #include "../melee/mcbodies.h"
! #include "../melee/mview.h"
! #include "../other/orbit.h"
! #include "../ship.h"
  #define STATION_LOG
  

Index: gtrug.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gtrug.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gtrug.cpp	13 Jan 2004 01:15:24 -0000	1.6
--- gtrug.cpp	29 Jan 2004 21:20:28 -0000	1.7
***************
*** 2,19 ****
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
! #include "scp.h"
! #include "ais.h"
  
! #include "melee/mframe.h"
! #include "melee/mgame.h"
! #include "melee/mview.h"
! #include "melee/mcontrol.h"
! #include "melee/mcbodies.h"
! #include "melee/mlog.h"
! #include "melee/mshppan.h"
! #include "melee/mnet1.h"
  
  #include "gtrug.h"
--- 2,19 ----
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
! #include "../scp.h"
! #include "../ais.h"
  
! #include "../melee/mframe.h"
! #include "../melee/mgame.h"
! #include "../melee/mview.h"
! #include "../melee/mcontrol.h"
! #include "../melee/mcbodies.h"
! #include "../melee/mlog.h"
! #include "../melee/mshppan.h"
! #include "../melee/mnet1.h"
  
  #include "gtrug.h"

Index: gtrug.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/gtrug.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gtrug.h	13 Jan 2004 01:15:24 -0000	1.5
--- gtrug.h	29 Jan 2004 21:20:28 -0000	1.6
***************
*** 2,6 ****
  #define __GTRUG_H__
  
! #include "util/t_rarray.h"
  
  struct MouseState;
--- 2,6 ----
  #define __GTRUG_H__
  
! #include "../util/t_rarray.h"
  
  struct MouseState;

Index: vanguard.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/vanguard.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** vanguard.cpp	13 Jan 2004 01:15:24 -0000	1.11
--- vanguard.cpp	29 Jan 2004 21:20:28 -0000	1.12
***************
*** 2,17 ****
  #include <string.h>		//Used for my DAT file searchers
  
! #include "melee.h"          //used by all TW source files.  well, mostly.
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "melee/mgame.h"    //Game stuff
! #include "melee/mcbodies.h" //asteroids & planets
! #include "melee/mship.h"    //ships
! #include "melee/mlog.h"     //networking / demo recording / demo playback
! #include "melee/mcontrol.h" //controllers & AIs
! #include "melee/mview.h"    //Views & messages
! #include "melee/mshppan.h"  //ship panels...
! #include "melee/mfleet.h"  //fleets...
! #include "other/orbit.h"
! #include "other/radar.h"
  
  /*******************************Defines**************************************/
--- 2,17 ----
  #include <string.h>		//Used for my DAT file searchers
  
! #include "../melee.h"          //used by all TW source files.  well, mostly.
  REGISTER_FILE                  //done immediately after #including melee.h, just because I said so
! #include "../melee/mgame.h"    //Game stuff
! #include "../melee/mcbodies.h" //asteroids & planets
! #include "../melee/mship.h"    //ships
! #include "../melee/mlog.h"     //networking / demo recording / demo playback
! #include "../melee/mcontrol.h" //controllers & AIs
! #include "../melee/mview.h"    //Views & messages
! #include "../melee/mshppan.h"  //ship panels...
! #include "../melee/mfleet.h"  //fleets...
! #include "../other/orbit.h"
! #include "../other/radar.h"
  
  /*******************************Defines**************************************/

Index: vgGenSys.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/vgGenSys.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** vgGenSys.cpp	13 Jan 2004 01:15:24 -0000	1.8
--- vgGenSys.cpp	29 Jan 2004 21:20:28 -0000	1.9
***************
*** 2,20 ****
  #include <stdio.h>
  
! #include "melee.h"
  REGISTER_FILE
! #include "melee/mframe.h"
! #include "melee/mgame.h"
! #include "melee/mmain.h"
! #include "melee/mcbodies.h"
! #include "melee/mview.h"
  
! #include "twgui/twgui.h"
! #include "twgui/twmenuexamples.h"
  
! #include "melee/mlog.h"
  
  #ifndef _V_BODIES_H
! #include "other/vbodies.h"
  #endif
  
--- 2,20 ----
  #include <stdio.h>
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../melee/mframe.h"
! #include "../melee/mgame.h"
! #include "../melee/mmain.h"
! #include "../melee/mcbodies.h"
! #include "../melee/mview.h"
  
! #include "../twgui/twgui.h"
! #include "../twgui/twmenuexamples.h"
  
! #include "../melee/mlog.h"
  
  #ifndef _V_BODIES_H
! #include "../other/vbodies.h"
  #endif
  

[Timewarp-commit] source/gamex/edit disk_stuff.cpp,1.2,1.3 disk_stuff.h,1.3,1.4 edit_dialogue.cpp,1.6,1.7 edit_dialogue.h,1.6,1.7

[<or...@pr...>]

Update of /cvsroot/timewarp/source/gamex/edit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source/gamex/edit

Modified Files:
	disk_stuff.cpp disk_stuff.h edit_dialogue.cpp edit_dialogue.h 
Log Message:
fixed project files, 
removed include paths, 
removed second gup.h, 
and #ifdefed scp.cpps dependancy upon gamex stuff

Index: disk_stuff.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/edit/disk_stuff.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** disk_stuff.cpp	13 Jan 2004 01:15:24 -0000	1.2
--- disk_stuff.cpp	29 Jan 2004 21:20:28 -0000	1.3
***************
*** 15,19 ****
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
--- 15,19 ----
  #include <string.h>
  
! #include "../../melee.h"
  REGISTER_FILE
  

Index: disk_stuff.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/edit/disk_stuff.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** disk_stuff.h	13 Jan 2004 01:15:24 -0000	1.3
--- disk_stuff.h	29 Jan 2004 21:20:28 -0000	1.4
***************
*** 3,7 ****
  #define __GAMEX_DISK_STUFF__
  
! #include "twgui/twgui.h"
  
  // part of this, should go into the gamedata section ?!
--- 3,7 ----
  #define __GAMEX_DISK_STUFF__
  
! #include "../../twgui/twgui.h"
  
  // part of this, should go into the gamedata section ?!

Index: edit_dialogue.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/edit/edit_dialogue.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** edit_dialogue.cpp	13 Jan 2004 01:15:24 -0000	1.6
--- edit_dialogue.cpp	29 Jan 2004 21:20:28 -0000	1.7
***************
*** 4,8 ****
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
--- 4,8 ----
  #include <string.h>
  
! #include "../../melee.h"
  REGISTER_FILE
  

Index: edit_dialogue.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/edit/edit_dialogue.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** edit_dialogue.h	13 Jan 2004 01:15:24 -0000	1.6
--- edit_dialogue.h	29 Jan 2004 21:20:28 -0000	1.7
***************
*** 4,13 ****
  
  
! #include "gameproject.h"
  
  #include "disk_stuff.h"
  
! #include "twgui/twgui.h"
! #include "twgui/twmenuexamples.h"
  
  const int Ntext = 2048;
--- 4,13 ----
  
  
! #include "../gameproject.h"
  
  #include "disk_stuff.h"
  
! #include "../../twgui/twgui.h"
! #include "../../twgui/twmenuexamples.h"
  
  const int Ntext = 2048;

[Timewarp-commit] source/gamex/general sprites.cpp,1.5,1.6

[<or...@pr...>]

Update of /cvsroot/timewarp/source/gamex/general
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322/source/gamex/general

Modified Files:
	sprites.cpp 
Log Message:
fixed project files, 
removed include paths, 
removed second gup.h, 
and #ifdefed scp.cpps dependancy upon gamex stuff

Index: sprites.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/general/sprites.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sprites.cpp	13 Jan 2004 01:15:29 -0000	1.5
--- sprites.cpp	29 Jan 2004 21:20:28 -0000	1.6
***************
*** 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"

[Timewarp-commit] twwin.dsp,1.26,1.27

[<geo...@pr...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31910

Added Files:
	twwin.dsp 
Log Message:
uploading a new replacement copy of twwin.dsp

[Timewarp-commit] twwin.dsp,1.25,NONE

[<geo...@pr...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31583

Removed Files:
	twwin.dsp 
Log Message:
no message

[Timewarp-commit] source/melee manim.cpp,1.5,1.6 mfleet.cpp,1.18,1.19 mgame.cpp,1.28,1.29 mmain.cpp,1.19,1.20 mshot.cpp,1.12,1.13

[<geo...@pr...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17116/melee

Modified Files:
	manim.cpp mfleet.cpp mgame.cpp mmain.cpp mshot.cpp 
Log Message:
some small changes

Index: manim.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/manim.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** manim.cpp	13 Jan 2004 01:15:25 -0000	1.5
--- manim.cpp	25 Jan 2004 12:40:22 -0000	1.6
***************
*** 4,7 ****
--- 4,8 ----
  REGISTER_FILE
  
+ #include "ship.h"
  #include "mgame.h"
  #include "manim.h"
***************
*** 33,37 ****
  }
  
! void Animation::calculate() {STACKTRACE
  	frame_step -= frame_time;
  	while (frame_step < 0) {
--- 34,46 ----
  }
  
! void Animation::calculate() {
! 	STACKTRACE;
! 
! 	if (!(ship && ship->exists()))
! 	{
! 		state = 0;
! 		return;
! 	}
! 
  	frame_step -= frame_time;
  	while (frame_step < 0) {
***************
*** 43,46 ****
--- 52,56 ----
  		}
  	SpaceObject::calculate();
+ 
  	}
  

Index: mfleet.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mfleet.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** mfleet.cpp	13 Jan 2004 01:15:25 -0000	1.18
--- mfleet.cpp	25 Jan 2004 12:40:24 -0000	1.19
***************
*** 79,83 ****
      };
  
!     void Fleet::reset() {STACKTRACE
          ships.clear();
          this->cost = 0;
--- 79,84 ----
      };
  
!     void Fleet::reset() {
! 		STACKTRACE;
          ships.clear();
          this->cost = 0;
***************
*** 135,138 ****
--- 136,141 ----
              }
          }
+ 		int s1 = s;
+ 
          char sname[64];
          for (j = 0; j < _fleet_size; j += 1) {
***************
*** 141,144 ****
--- 144,162 ----
              ShipType *t = shiptype(sname);
              if (!t) {
+ 				// extra debug info :
+ 				FILE *f;
+ 				f = fopen("error2.log", "wt");
+ 				fprintf(f, "j = %i  size = %i\n", j, _fleet_size);
+ 
+ 				s = s1;
+ 				int n;
+ 		        for (n = 0; n < _fleet_size; n += 1)
+ 				{
+ 		            READ2(sname, k[n]);
+ 				    sname[k[n]] = '\0';
+ 					fprintf(f, "%s\n", sname);
+ 				}
+ 
+ 				fclose(f);
                  tw_error("deserialize fleet - bad shiptype (%s)", sname);
              }
***************
*** 195,198 ****
--- 213,217 ----
  
          for (MyFleetListType::iterator iter = ships.begin(); iter != ships.end(); iter++) {
+ 			if (!(*iter)) {tw_error("trying to save invalid ship type in fleet");}
              sprintf(slot_str, "Slot%d", count);
              set_config_string(section, slot_str, (*iter)->id);
***************
*** 216,220 ****
          int _fleet_size = get_config_int(section, "Size", 0);
          _fleet_title = get_config_string(section, "Title", "");
!         sprintf(title, _fleet_title);
          maxFleetCost = (FleetCost) get_config_int(section, "MaxFleetCost", FLEET_COST_DEFAULT);
      
--- 235,240 ----
          int _fleet_size = get_config_int(section, "Size", 0);
          _fleet_title = get_config_string(section, "Title", "");
!         //sprintf(title, _fleet_title);	this is a bit dangerous
! 		strcpy(title, _fleet_title);
          maxFleetCost = (FleetCost) get_config_int(section, "MaxFleetCost", FLEET_COST_DEFAULT);
      

Index: mgame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** mgame.cpp	13 Jan 2004 01:15:25 -0000	1.28
--- mgame.cpp	25 Jan 2004 12:40:25 -0000	1.29
***************
*** 471,475 ****
  			// set "enable run-type information" for this feature
  			// (rebuild all after changing that option)
! 			fprintf(f, "%030s %011.3e %011.3e %011.3e %011.3e %03i 0x%08X 0x%08X 0x%08X\n",
  				typeid(*s).name(), p.x, p.y, v.x, v.y, is, (unsigned int)s, (unsigned int)s->ship, (unsigned int)s->target );
  		}
--- 471,475 ----
  			// set "enable run-type information" for this feature
  			// (rebuild all after changing that option)
! 			fprintf(f, "%30s %11.3e %011.3e %11.3e %11.3e %3i 0x%08X 0x%08X 0x%08X\n",
  				typeid(*s).name(), p.x, p.y, v.x, v.y, is, (unsigned int)s, (unsigned int)s->ship, (unsigned int)s->target );
  		}

Index: mmain.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mmain.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** mmain.cpp	13 Jan 2004 01:15:25 -0000	1.19
--- mmain.cpp	25 Jan 2004 12:40:43 -0000	1.20
***************
*** 523,527 ****
--- 523,529 ----
  		Fleet *fleet = player_fleet[i];
  		if (slot[i] == -1) slot[i] = random() % fleet->getSize();
+ 		if (slot[i] < 0 || slot[i] >= fleet->getSize()) {tw_error("trying to load invalid ship");}
  		Ship *s = create_ship(fleet->getShipType(slot[i])->id, player_control[i], random(size), random(PI2), player_team[i]);
+ 		if (!s) {tw_error("unable to create ship");}
  		fleet->clear_slot(slot[i]);
  		fleet->Sort();

Index: mshot.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mshot.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mshot.cpp	13 Jan 2004 01:15:26 -0000	1.12
--- mshot.cpp	25 Jan 2004 12:40:44 -0000	1.13
***************
*** 48,51 ****
--- 48,58 ----
  void Shot::calculate() {
  	SpaceObject::calculate();
+ 
+ 	if (!(ship && ship->exists()))
+ 	{
+ 		state = 0;
+ 		return;
+ 	}
+ 
  	d += v * frame_time;
  	if(d >= range) state = 0;

[Timewarp-commit] source scp.cpp,1.35,1.36

[<geo...@pr...>]

Update of /cvsroot/timewarp/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17116

Modified Files:
	scp.cpp 
Log Message:
some small changes

Index: scp.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/scp.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** scp.cpp	17 Jan 2004 15:42:39 -0000	1.35
--- scp.cpp	25 Jan 2004 12:39:48 -0000	1.36
***************
*** 339,342 ****
--- 339,343 ----
  		set_config_string("Network", "Address", addressaddress);
  		message.out("...");
+ 		message.animate(0);
  		i = ((NetLog*)log)->net.connect(addressaddress, port, is_escape_pressed);
  		free(addressaddress);
***************
*** 380,383 ****
--- 381,385 ----
  
  		message.out("...");
+ 		message.animate(0);
  		log->net.listen(port, is_escape_pressed);
  		
***************
*** 616,626 ****
  	enable();
  
- 	/*
- 				disable();
- 				play_fg(&scp, SCPGUI_MUSIC);
- 				enable();
- 				showTitle();
- 	//*/
- 
  	int mainRet;
  	do {
--- 618,621 ----
***************
*** 813,816 ****
--- 808,813 ----
  			if (!strcmp(auto_play, "net1client")) play_net1client(auto_param, auto_port);
  			if (!strcmp(auto_play, "net1server")) play_net1server(auto_param, auto_port);
+ 			if (!strcmp(auto_play, "fg")) play_fg(&scp, SCPGUI_MUSIC);
+ 
  		}
  		else {
***************
*** 1303,1308 ****
      fleetDialog[FLEET_DIALOG_POINT_LIMIT_BUTTON].dp = maxFleetCostString;
      
! 	// the reference_fleet is used in the list in a hardcoded way, so over"load" it
!     Fleet *old_reference_fleet = reference_fleet;
  
  	do {
--- 1300,1305 ----
      fleetDialog[FLEET_DIALOG_POINT_LIMIT_BUTTON].dp = maxFleetCostString;
      
! //	// the reference_fleet is used in the list in a hardcoded way, so over"load" it
! //    Fleet *old_reference_fleet = reference_fleet;
  
  	do {
***************
*** 1414,1418 ****
             case FLEET_DIALOG_AVAILABLE_SHIPS_LIST:
             case FLEET_DIALOG_ADD_BUTTON: 
!                selectedSlot = fleet->addShipType(reference_fleet->getShipType(fleetDialog[FLEET_DIALOG_AVAILABLE_SHIPS_LIST].d1));
                 if (selectedSlot != -1)
                     fleetDialog[FLEET_DIALOG_FLEET_SHIPS_LIST].d1 = selectedSlot;
--- 1411,1419 ----
             case FLEET_DIALOG_AVAILABLE_SHIPS_LIST:
             case FLEET_DIALOG_ADD_BUTTON: 
! 			   int k;
! 			   k = fleetDialog[FLEET_DIALOG_AVAILABLE_SHIPS_LIST].d1;
! 			   if (k < 0 || k >= reference_fleet->getSize()) {tw_error("invalid ship choice - bug");}
! 
!                selectedSlot = fleet->addShipType(reference_fleet->getShipType(k));
                 if (selectedSlot != -1)
                     fleetDialog[FLEET_DIALOG_FLEET_SHIPS_LIST].d1 = selectedSlot;
***************
*** 1498,1502 ****
  	} while((fleetRet != FLEET_DIALOG_BACK_BUTTON) && (fleetRet != -1));
  
! 	reference_fleet = old_reference_fleet;
  
  	fleet->save("fleets.ini", tmp);
--- 1499,1503 ----
  	} while((fleetRet != FLEET_DIALOG_BACK_BUTTON) && (fleetRet != -1));
  
! //	reference_fleet = old_reference_fleet;
  
  	fleet->save("fleets.ini", tmp);

[Timewarp-commit] source/gamex gamedata.cpp,1.9,1.10 gamedata.h,1.10,1.11 gamedata_map.cpp,1.2,1.3 gamehyper.cpp,1.7,1.8 gameplanetscan.cpp,1.6,1.7 gameplanetscan.h,1.5,1.6 projectx.cpp,1.12,1.13

[<geo...@pr...>]

Update of /cvsroot/timewarp/source/gamex
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17116/gamex

Modified Files:
	gamedata.cpp gamedata.h gamedata_map.cpp gamehyper.cpp 
	gameplanetscan.cpp gameplanetscan.h projectx.cpp 
Log Message:
some small changes

Index: gamedata.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamedata.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gamedata.cpp	13 Jan 2004 01:15:22 -0000	1.9
--- gamedata.cpp	25 Jan 2004 12:40:19 -0000	1.10
***************
*** 19,22 ****
--- 19,24 ----
  IndexTypeList *surfacetypelist;
  IndexTypeList *starsurfacetypelist;
+ IndexTypeList *mineraltypelist;
+ IndexTypeList *structuretypelist;
  
  PlayerInfo		playerinfo;

Index: gamedata.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamedata.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gamedata.h	13 Jan 2004 01:15:22 -0000	1.10
--- gamedata.h	25 Jan 2004 12:40:21 -0000	1.11
***************
*** 252,255 ****
--- 252,257 ----
  extern IndexTypeList *surfacetypelist;
  extern IndexTypeList *starsurfacetypelist;
+ extern IndexTypeList *mineraltypelist;
+ extern IndexTypeList *structuretypelist;
  
  #endif // __GAMEX_DATA__

Index: gamedata_map.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamedata_map.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gamedata_map.cpp	13 Jan 2004 01:15:22 -0000	1.2
--- gamedata_map.cpp	25 Jan 2004 12:40:21 -0000	1.3
***************
*** 116,119 ****
--- 116,121 ----
  	surfacetypelist = new IndexTypeList("gamex/planetscan/surface_*.ini");
  	starsurfacetypelist = new IndexTypeList("gamex/stars/surface_*.ini");
+ 	mineraltypelist = new IndexTypeList("gamex/gamedata/mineraltypes/*.ini");
+ 	structuretypelist = new IndexTypeList("gamex/gamedata/structuretypes/*.ini");
  	
  	FILE *f = fopen(filename, "rt");

Index: gamehyper.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamehyper.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gamehyper.cpp	13 Jan 2004 01:15:22 -0000	1.7
--- gamehyper.cpp	25 Jan 2004 12:40:21 -0000	1.8
***************
*** 492,495 ****
--- 492,496 ----
  	// create star objects
  	starmap = mapeverything.sub[0];	// use the starmap of the 1st region
+ 	if (mapeverything.Nsub == 0) {tw_error("something is wrong with the map - there are no stars");}
  
  
***************
*** 663,667 ****
  	if (!hardexit)
  	{
! 		playerinfo.sync(player);		// info equals local player
  
  		// check if the starmap hasn't changed (by editing)
--- 664,668 ----
  	if (!hardexit)
  	{
! 		playerinfo.sync(player);		// local copies from global player-info
  
  		// check if the starmap hasn't changed (by editing)

Index: gameplanetscan.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameplanetscan.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gameplanetscan.cpp	13 Jan 2004 01:15:22 -0000	1.6
--- gameplanetscan.cpp	25 Jan 2004 12:40:21 -0000	1.7
***************
*** 24,27 ****
--- 24,29 ----
  #include "melee/mshot.h"
  
+ #include "twgui/gamebuttonevent.h"
+ 
  
  static GamePlanetscan::ThePlaya *localplayer;
***************
*** 38,41 ****
--- 40,107 ----
  
  
+ /* Structure type:
+ Each structure is unique. It is decribed by these files:
+ id.ini
+ id.bmp
+ id.dialogue
+ */
+ 
+ class StructureType
+ {
+ public:
+ 	StructureType();
+ 	
+ 	char id[64];
+ 
+ 	SpaceSprite *sprite;
+ 
+ 	void init(char *aid);
+ };
+ 
+ 
+ StructureType::StructureType()
+ {
+ 	sprite = 0;
+ 	id[0] = 0;
+ }
+ 
+ void StructureType::init(char *aid)
+ {
+ 	strcpy(id, aid);
+ 
+ 	char fname[512];
+ 
+ 	sprintf(fname, "gamex/gamedata/structuretypes/%s_01.bmp", id);
+ 	sprite = create_sprite( fname, SpaceSprite::MASKED, 1 );
+ }
+ 
+ 
+ StructureType *structuretype[128];
+ 
+ //char **mineralnamelist;
+ //int Nmineraltypes;
+ 
+ void init_structuretypes()
+ {
+ 	
+ 	int i;
+ 	for ( i = 0; i < structuretypelist->N; ++i )
+ 	{
+ 		char *id;
+ 
+ 		id = structuretypelist->type[i].type_string;
+ 
+ 
+ 		StructureType *st;
+ 		st = new StructureType();
+ 		st->init(id);
+ 
+ 		structuretype[i] = st;
+ 	}
+ }
+ 
+ 
+ 
+ 
  const int ID_MINERAL = 0x0f5b3a7ec;
  
***************
*** 149,166 ****
  MineralType *mineraltype[16];
  
! char **mineralnamelist;
! int Nmineraltypes;
  
  void init_mineraltypes()
  {
! 	createfilelist(&mineralnamelist, &Nmineraltypes,
! 									"gamex/gamedata/mineraltypes/*.ini", 0);
  	
  	int i;
! 	for ( i = 0; i < Nmineraltypes; ++i )
  	{
  		char *id;
  
! 		id = mineralnamelist[i];
  
  
--- 215,232 ----
  MineralType *mineraltype[16];
  
! //char **mineralnamelist;
! //int Nmineraltypes;
  
  void init_mineraltypes()
  {
! //	createfilelist(&mineralnamelist, &Nmineraltypes,
! //									"gamex/gamedata/mineraltypes/*.ini", 0);
  	
  	int i;
! 	for ( i = 0; i < mineraltypelist->N; ++i )
  	{
  		char *id;
  
! 		id = mineraltypelist->type[i].type_string;
  
  
***************
*** 173,186 ****
  }
  
! MineralType *get_mineraltype(const char *id)
  {
! 	int i = 0;
  
! 	for ( i = 0; i < Nmineraltypes; ++i )
! 	{
! 		if (strcmp(id, mineraltype[i]->id) == 0)
! 			return mineraltype[i];
! 	}
! 	return 0;
  }
  
--- 239,248 ----
  }
  
! MineralType *get_mineraltype(char *id)
  {
! 	int i;
! 	i = mineraltypelist->get_index(id, 0);
  
! 	return mineraltype[i];
  }
  
***************
*** 198,202 ****
  	
  	int i;
! 	for ( i = 0; i < Nmineraltypes; ++i )
  	{
  		char *id;
--- 260,264 ----
  	
  	int i;
! 	for ( i = 0; i < Nlifeformtypes; ++i )
  	{
  		char *id;
***************
*** 318,323 ****
  Mineral *init_mineral(char *section, Vector2 pos)
  {
! 	const char *s;
! 	s = get_config_string(section, "type", "common");
  	MineralType	*type;
  	type = get_mineraltype(s);
--- 380,385 ----
  Mineral *init_mineral(char *section, Vector2 pos)
  {
! 	char s[512];
! 	strcpy(s, get_config_string(section, "type", "common"));
  	MineralType	*type;
  	type = get_mineraltype(s);
***************
*** 483,487 ****
  
  
! /*
  class Structure : public MapObj
  {
--- 545,554 ----
  
  
! 
! 
! // SPECIAL STRUCTURES ON THE PLANET SURFACES
! // like ... what ?
! // Well, anything that spawns a dialog and can result in some special actions.
! 
  class Structure : public MapObj
  {
***************
*** 495,682 ****
  };
  
- */
- 
- /*
- class SurfaceInfo : public SpacebodyInfo
- {
- public:
- 	//int	idcode;
- 
- 	SurfaceInfo();
- 
- //	Mineral		**minerals;
- //	Lifeform	**lifeforms;
- //	Structure	**structures;
- 
- 	int	Nlife, Nenergy, Nstructure;
- 
- 	// environment stats
- 	double orbit, atmo, temp, mass, radius, gravity, day, tilt, albedo1, albedo2;
- 	int weatherclass, tectonicsclass;
- 
- 	virtual void init(MapSpacebody *planet);
- 	virtual void write(MapSpacebody *planet);
- };
- 
- 
- class StarInfo : public SpacebodyInfo
- {
- public:
- 
- 	double star_temp;	// in degr. Kelvin (K)
- 	double systemsize;	// in astr. units (ae)
- 	double sunradius;	// in ae (1 ae = earth orbit)
- 
- 	StarInfo();
- 
- 	// environment stats
- 
- 	virtual void init(MapSpacebody *planet);
- 	virtual void write(MapSpacebody *planet);
- };
- 
- 
- SurfaceInfo::SurfaceInfo()
- {
- }
- 
- void SurfaceInfo::write(MapSpacebody *planet)
- {
- 	 CHANGED: this is edited/written only in solarview/planetview mode !!
- 	char tmp[16];
- 	sprintf(tmp, "%X", planet->id);
- 
- 	char fname[512];
- 	strcpy(fname, "gamex/gamedata/surface/");
- 	strcat(fname, tmp);
- 	strcat(fname, ".ini");
- 
- 	set_config_file(fname);
- 
- 
- 
- 	set_config_float("stats", "albedo1", albedo1);
- 	set_config_float("stats", "albedo2", albedo2);
- 
- 	set_config_float("stats", "atmo", atmo);
- 	set_config_float("stats", "temp", temp);
- 	set_config_float("stats", "mass", mass);
- 	set_config_float("stats", "radius", radius);
- 	set_config_float("stats", "gravity", gravity);
- 	set_config_float("stats", "day", day);
- 	set_config_float("stats", "tilt", tilt);
- 
- 	set_config_int("stats", "weather", weatherclass);
- 	set_config_int("stats", "tectonics", tectonicsclass);
- 	
- }
- 
- 
- void SurfaceInfo::init(MapSpacebody *planet)
- {
- 	char tmp[16];
- 	sprintf(tmp, "%X", planet->id);
- 
- 	char fname[512];
- 	strcpy(fname, "gamex/gamedata/surface/");
- 	strcat(fname, tmp);
- 	strcat(fname, ".ini");
- 
- 	set_config_file(fname);
- 
- 
- 	// the plotted inner part of the solar system is zoomed-in this way...
- 	double systemsize = 100.0;	// in astr. units (ae)
- 	orbit = exp(planet->position.length() * systemsize / 1000.0);
- 
- 	double star_temp = 6000.0;	// in degr. Kelvin (K)
- 	double sunradius = 0.001;	// ?? in ae ...
- 	double tempref;				// if there is no atmosphere ...
- 	tempref = star_temp * sqrt(0.5 * sunradius / orbit);
- 	// then this is the temp, for airless moons and such, with 0 albedo,
- 	// on average over the whole surface (incl. night-side, yeah otherwise it wouldn't
- 	// be an average right;). This is of course completely meaningless 
- 	// cause it can vary from 300K on the equator facing the sun, to 0K on the night
- 	// side and the polar caps. But ... well, vehicles can perhaps operate in
- 	// low temps relatively well cause they generate their own heat, but in
- 	// high temps very poorly cause they can't cool themselves. So, it makes "some"
- 	// sense ... that would make a moving "hotspot" for a rotating planet important
- 	// perhaps ? Actual temperatures varying on the surface facing the sun would be:
- 	// tempref = star_temp * sqrt(sunradius / orbit) * cos(lat) * cos(lon);
- 	// where lat=latitude, lon=olngitude (not taking albedo or something into account).
- 	// and 0 temperature in the night-side.
- 
- 	// albedo is the fraction of energy that is radiated back into space ...
- 	// and since energy ~ temp-to-the-power-4, albedo is root/root
- 	// high value means, lots of light (=energy) is reflected. It can be radiated
- 	// back because of the surface, or atmosphere (clouds). The reflected energy
- 	// never reaches the planet and doesn't contribute to temperature increase.
- 	albedo1 = 0.4;	// typical for earth
- 	albedo1 = get_config_float("stats", "albedo1", 0.0);
- 	tempref *= sqrt(sqrt(1 - albedo1));
- 
- 	// green-house effect in case of atmosphere; radiated energy has different
- 	// frequency (cause T is lower), and therefore a different overall albedo
- 	// for the outgoing energy can be used, than what's used for incoming energy.
- 	albedo2 = 0;	// nothing is reflected back to the planet, all is passed to space.
- 	albedo2 = get_config_float("stats", "albedo2", 0.0);
- 	tempref /= sqrt(sqrt(1 - albedo2));
- 
- 	atmo = get_config_float("stats", "atmo", 1.0);
- 	temp = get_config_float("stats", "temp", 1.0);
- 	mass = get_config_float("stats", "mass", 1.0);
- 	radius = get_config_float("stats", "radius", 1.0);
- 	gravity = get_config_float("stats", "gravity", 1.0);
- 	day = get_config_float("stats", "day", 1.0);
- 	tilt = get_config_float("stats", "tilt", 1.0);
- 	weatherclass = get_config_int("stats", "weather", 1);
- 	tectonicsclass = get_config_int("stats", "tectonics", 1);
- }
- 
- 
- 
- 
- StarInfo::StarInfo()
- {
- 	star_temp = 6000.0;	// in degr. Kelvin (K)
- 	systemsize = 100.0;	// in astr. units (ae)
- 	sunradius = 0.001;	// ?? in ae ...
- }
- 
- void StarInfo::write(MapSpacebody *star)
- {
- 	char tmp[16];
- 	sprintf(tmp, "%X", star->id);
- 
- 	char fname[512];
- 	strcpy(fname, "gamex/gamedata/surface/");
- 	strcat(fname, tmp);
- 	strcat(fname, ".ini");
- 
- 	set_config_file(fname);
- 
- 	set_config_float("stats", "temp", star_temp);
- 	set_config_float("stats", "systemsize", systemsize);
- 	set_config_float("stats", "radius", sunradius);
- }
- 
- void StarInfo::init(MapSpacebody *star)
- {
- 	char tmp[16];
- 	sprintf(tmp, "%X", star->id);
- 
- 	char fname[512];
- 	strcpy(fname, "gamex/gamedata/surface/");
- 	strcat(fname, tmp);
- 	strcat(fname, ".ini");
- 
- 	set_config_file(fname);
- 
- 	star_temp = get_config_float("stats", "temp", 6000);
- 	systemsize = get_config_float("stats", "systemsize", 100.0);
- 	sunradius = get_config_float("stats", "radius", 0.001);
- }
- 
- */
  
  
--- 562,565 ----
***************
*** 704,707 ****
--- 587,591 ----
  	GameBare::init();
  
+ 
  	
  	//size = Vector2(H, H*tempframe->ratio);
***************
*** 716,720 ****
  	// create star objects ?!
  	int istar, iplanet, imoon;
- 	MapSpacebody *starmap, *solarmap, *planetmap, *moonmap;
  	starmap = mapeverything.sub[0];	// use the starmap of the 1st region
  
--- 600,603 ----
***************
*** 737,770 ****
  	
  
  	//SpaceSprite *spr;
  
- 	char *typestr;
  	char txt[512];
  
! 	if ( imoon == -1 )
! 	{
! 		// exploring a PLANET
! 		// load the planet sprite
  
! 		typestr = planettypelist->type[planetmap->type].type_string;
  
- 		// load the surface map of this planet (or moon)
- 		sprintf(txt, "gamex/planetscan/planet_%s_01.bmp",typestr);
- 		map_bmp = load_bitmap(txt, 0);
- 		// (at the moment, this is resolution dependent...)
- 		// this should be scaled using a scaled blit...
  
! 	} else {
  
! 		// exploring a MOON
! 		typestr = planettypelist->type[moonmap->type].type_string;
! 		
! 		// load the surface map of this planet (or moon)
! 		sprintf(txt, "gamex/planetscan/moon_%s_01.bmp",typestr);
! 		map_bmp = load_bitmap(txt, 0);
! 		// (at the moment, this is resolution dependent...)
! 		// this should be scaled using a scaled blit...
  
! 	}
  
  	// map_bmp should have 32 bit depth, because colors are assumed to come from
--- 620,662 ----
  	
  
+ 	init_mineraltypes();
+ 	init_lifeformtypes();
+ 
  	//SpaceSprite *spr;
  
  	char txt[512];
  
! 	if ( !moonmap )
! 		body = planetmap;
! 	else
! 		body = moonmap;
  
! 	sprintf(txt, "gamex/gamedata/surface/%08X.ini", body->id);
! 	set_config_file(txt);
! 	const char *st;
! 	st = get_config_string(0, "surface", "default");
! 	sprintf(txt, "gamex/planetscan/surface_%s_01.bmp", st);
! 	map_bmp = load_bitmap(txt, 0);
  
  
! 	// init stats ...
! 	sprintf(txt, "gamex/planetscan/surface_%s.ini", st);
! 	set_config_file(txt);
  
! 	nmin = get_config_int(0, "NumMin", 0);
! 	nmax = get_config_int(0, "NumMax", 10);
! 	avsize = get_config_int(0, "AvSize", 10);
  
! 	int i;
! 	for ( i = 0; i < mineraltypelist->N; ++i )
! 		frac[i] = get_config_float("fraction", mineraltypelist->type[i].type_string, 0.0);
! 
! 	int totfrac = 0;
! 	for ( i = 0; i < mineraltypelist->N; ++i )
! 		totfrac += frac[i];
! 
! 	for ( i = 0; i < mineraltypelist->N; ++i )
! 		frac[i] /= totfrac;
! 	// so that the sum of all fractions == 1
  
  	// map_bmp should have 32 bit depth, because colors are assumed to come from
***************
*** 838,877 ****
  
  
  
! 	// test:
! 	// place a number of mineral sprites on the surface, of any type.
! 
! 	init_mineraltypes();
! 	init_lifeformtypes();
  
- 	int N = 5;
- 	int i;
  	for ( i = 0; i < N; ++i )
  	{
! 		int k;
  
! 		k = random(Nmineraltypes);
  		SpaceSprite *spr;
  		spr = mineraltype[k]->sprite;
  
! 		Mineral *mine;
! 		mine = new Mineral(0, random(Vector2(400,200)) * scalesurface, 0, spr);
! 		mine->type = mineraltype[k];
! 		mine->weight = 1;
  		//mine->init(mineralnamelist[k]);
  
! 		add(mine);
  
- 		
- 		k = random(Nlifeformtypes);
- 		spr = lifeformtype[k]->sprite;
  
! 		Lifeform *life;
! 		life = new Lifeform(0, random(Vector2(400,200)) * scalesurface, 0, spr);
! 		//mine->init(mineralnamelist[k]);
  
! 		add(life);
! 	}
  
  }
  
--- 730,787 ----
  
  
+ 	// read the mineral loactions/ types from disk :
+ 	
+ 	sprintf(txt, "gamex/gamedata/surface/%08X.ini", body->id);
+ 	set_config_file(txt);
  
! 	int N;
! 	N = get_config_int("minerals", "N", 0);
  
  	for ( i = 0; i < N; ++i )
  	{
! 		char id[512];
! 		char val[512];
  
! 		sprintf(id, "mineral%03i", i);
! 		strcpy(val, get_config_string("minerals", id, ""));
! 
! 		double x, y;
! 		sscanf(val, "%lf %lf %s", &x, &y, id);
! 
! 		int k;
! 		k = mineraltypelist->get_index(id, 0);
! 	
  		SpaceSprite *spr;
  		spr = mineraltype[k]->sprite;
  
! 		mine[i] = new Mineral(0, Vector2(x,y) * scalesurface, 0, spr);
! 		mine[i]->type = mineraltype[k];
! 		mine[i]->weight = 1;
  		//mine->init(mineralnamelist[k]);
  
! 		add(mine[i]);
! 	}
  
  
! 	// an extra window, with "random" buttons so that you can re-randomize the minerals
! 	// and lifeform map (given the constraints in the surface.ini file)
  
! 	Pran = new Popup("gamex/interface/planetscan/edit", 0, 0, T->screen);
! 	Pran->exclusive = false;
! 
! 	branmin = new Button(Pran, "ranm_");
! 	branlif = new Button(Pran, "ranl_");
! 
! 
! 	Pran->layer = 1;
! 	T->layer = 2;
! 
! 	T->add(Pran);
! 	T->tree_doneinit();
! 
! 	Pran->show();
! 	Pran->focus();
  
+ 	branmin->bind(new BEvent<GamePlanetscan>(this, &GamePlanetscan::handle_ranmin, 0));
  }
  
***************
*** 1065,1067 ****
--- 975,1058 ----
  
  
+ void GamePlanetscan::handle_ranmin()
+ {
+ 	int i;
+ 
+ 	// delete existing mineral types from the game:
+ 	for ( i = 0; i < num_items; ++i )
+ 	{
+ 		if (item[i]->id == ID_MINERAL)
+ 			item[i]->state = 0;
+ 	}
+ 
+ 	// place a number of mineral sprites on the surface, of any type.
+ 
+ 	int N;
+ 	char txt[512];
+ 
+ 	N = random(nmin, nmax);
+ 
+ 	for ( i = 0; i < N; ++i )
+ 	{
+ 		// instead of :k = random(mineraltypelist->N);
+ 		// choose from a probability (-density-) distribution of the available types:
+ 		double r;
+ 		int k;
+ 
+ 		r = random(1.0);
+ 		for ( k = 0; k < mineraltypelist->N; ++k )
+ 		{
+ 			r -= frac[k];
+ 			if (r <= 0)
+ 				break;
+ 		}
+ 		if (k == mineraltypelist->N)	// invalid value (should not occur)
+ 			k = mineraltypelist->N - 1;
+ 
+ 
+ 		SpaceSprite *spr;
+ 		spr = mineraltype[k]->sprite;
+ 
+ 		mine[i] = new Mineral(0, random(Vector2(400,200)) * scalesurface, 0, spr);
+ 		mine[i]->type = mineraltype[k];
+ 		mine[i]->weight = 1;
+ 		//mine->init(mineralnamelist[k]);
+ 
+ 		add(mine[i]);
+ 
+ 	
+ 		/*
+ 		k = random(Nlifeformtypes);
+ 		spr = lifeformtype[k]->sprite;
+ 
+ 		Lifeform *life;
+ 		life = new Lifeform(0, random(Vector2(400,200)) * scalesurface, 0, spr);
+ 		//mine->init(mineralnamelist[k]);
+ 
+ 		add(life);
+ 		*/
+ 	}
+ 
+ 
+ 	// write the mineral loactions/ types to disk :
+ 	
+ 	sprintf(txt, "gamex/gamedata/surface/%08X.ini", body->id);
+ 	set_config_file(txt);
+ 
+ 	for ( i = 0; i < N; ++i )
+ 	{
+ 		char id[512];
+ 		char val[512];
+ 
+ 		set_config_int("minerals", "N", N);
+ 
+ 		sprintf(id, "mineral%03i", i);
+ 		sprintf(val, "%f %f %s", mine[i]->pos.x/scalesurface, mine[i]->pos.y/scalesurface,
+ 		mine[i]->type->id);
+ 		set_config_string("minerals", id, val);
+ 	}
  
+ 	flush_config_file();
+ 
+ 
+ }

Index: gameplanetscan.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameplanetscan.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gameplanetscan.h	13 Jan 2004 01:15:22 -0000	1.5
--- gameplanetscan.h	25 Jan 2004 12:40:21 -0000	1.6
***************
*** 20,23 ****
--- 20,28 ----
  //	SpaceObject *solarbody;
  
+ 	Popup *Pran;
+ 	Button *branmin, *branlif;
+ 
+ 	MapSpacebody *starmap, *solarmap, *planetmap, *moonmap, *body;
+ 
  	Planet3D *rotatingplanet;
  
***************
*** 54,57 ****
--- 59,68 ----
  	//double scalesurface;
  
+ 	int		nmin, nmax;
+ 	double	avsize, frac[32];
+ 	Mineral *mine[64];
+ 
+ 	void handle_ranmin();
+ 
  };
  

Index: projectx.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/projectx.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** projectx.cpp	13 Jan 2004 01:15:23 -0000	1.12
--- projectx.cpp	25 Jan 2004 12:40:21 -0000	1.13
***************
*** 76,88 ****
  	if (playerinfo.iplanet >= 0)
  		add( new GamePlanetview() );
! 		*/
  		
  		
  		
  
! 	add( new GameStarmap() );
  //	add( new GameSolarview() );
  //	add( new GamePlanetview() );
! //	add( new GamePlanetscan() );
  //	add( new GameMelee() );
  //	add( new GameDialogue() );		// the editor
--- 76,88 ----
  	if (playerinfo.iplanet >= 0)
  		add( new GamePlanetview() );
! //		*/
  		
  		
  		
  
! //	add( new GameStarmap() );
  //	add( new GameSolarview() );
  //	add( new GamePlanetview() );
! 	add( new GamePlanetscan() );
  //	add( new GameMelee() );
  //	add( new GameDialogue() );		// the editor

[Timewarp-commit] source/sc3ships shpowavo.cpp,1.6,1.7 shpxchex.cpp,1.9,1.10

[<geo...@pr...>]

Update of /cvsroot/timewarp/source/sc3ships
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17116/sc3ships

Modified Files:
	shpowavo.cpp shpxchex.cpp 
Log Message:
some small changes

Index: shpowavo.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpowavo.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpowavo.cpp	13 Jan 2004 01:15:29 -0000	1.6
--- shpowavo.cpp	25 Jan 2004 12:41:06 -0000	1.7
***************
*** 248,251 ****
--- 248,258 ----
  	}
  void OwaDisable::calculate() {
+ 
+ 	if (!(ship && ship->exists()))
+ 	{
+ 		state = 0;
+ 		return;
+ 	}
+ 
  	frame_step+= frame_time;
  	while (frame_step >= frame_size) {

Index: shpxchex.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpxchex.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpxchex.cpp	13 Jan 2004 01:15:29 -0000	1.9
--- shpxchex.cpp	25 Jan 2004 12:41:08 -0000	1.10
***************
*** 109,112 ****
--- 109,119 ----
  
  void XchaggerDisable::calculate() {
+ 
+ 	if (!(ship && ship->exists()))
+ 	{
+ 		state = 0;
+ 		return;
+ 	}
+ 
  	int keyleft,keyright;
  	frame_step+= frame_time;

[Timewarp-commit] source/sc1ships shpandgu.cpp,1.8,1.9

[<geo...@pr...>]

Update of /cvsroot/timewarp/source/sc1ships
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17116/sc1ships

Modified Files:
	shpandgu.cpp 
Log Message:
some small changes

Index: shpandgu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpandgu.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpandgu.cpp	13 Jan 2004 01:15:29 -0000	1.8
--- shpandgu.cpp	25 Jan 2004 12:41:04 -0000	1.9
***************
*** 148,151 ****
--- 148,157 ----
  void AndrosynthBubble::calculate()
  {
+ 	if (!(ship && ship->exists()))
+ 	{
+ 		state = 0;
+ 		return;
+ 	}
+ 
  	double newAngle;
  

[Timewarp-commit] source/newships shpstrsc.cpp,1.8,1.9

[<geo...@pr...>]

Update of /cvsroot/timewarp/source/newships
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17116/newships

Modified Files:
	shpstrsc.cpp 
Log Message:
some small changes

Index: shpstrsc.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpstrsc.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpstrsc.cpp	13 Jan 2004 01:15:28 -0000	1.8
--- shpstrsc.cpp	25 Jan 2004 12:40:50 -0000	1.9
***************
*** 164,168 ****
  
  	//If the mothership doesn't exist, turn the hilight off.
! 	if(!ship->exists())
  	{
  		state=0;
--- 164,168 ----
  
  	//If the mothership doesn't exist, turn the hilight off.
! 	if(!(ship && ship->exists()))
  	{
  		state=0;
***************
*** 259,263 ****
  void Marker::calculate()
  {
! 	STACKTRACE
  	state=1;
  
--- 259,263 ----
  void Marker::calculate()
  {
! 	STACKTRACE;
  	state=1;
  
***************
*** 275,279 ****
  void Marker::inflict_damage(SpaceObject *other)
  {
! 	STACKTRACE
  	//If the target isn't the right type, don't latch on.
  
--- 275,279 ----
  void Marker::inflict_damage(SpaceObject *other)
  {
! 	STACKTRACE;
  	//If the target isn't the right type, don't latch on.
  

[Timewarp-commit] source/twgui gamebuttonevent.h,1.2,1.3 area.cpp,1.5,NONE area.h,1.5,NONE gametest.cpp,1.7,NONE gametest.h,1.3,NONE

[<geo...@pr...>]

Update of /cvsroot/timewarp/source/twgui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17116/twgui

Modified Files:
	gamebuttonevent.h 
Removed Files:
	area.cpp area.h gametest.cpp gametest.h 
Log Message:
some small changes

Index: gamebuttonevent.h
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/gamebuttonevent.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gamebuttonevent.h	10 Jan 2004 22:27:59 -0000	1.2
--- gamebuttonevent.h	25 Jan 2004 12:41:24 -0000	1.3
***************
*** 53,57 ****
  void BEvent<G>::handle_main_hold()
  {
! 	if (mainpress)
  		(g->*mainhold) ();
  }
--- 53,57 ----
  void BEvent<G>::handle_main_hold()
  {
! 	if (mainhold)
  		(g->*mainhold) ();
  }
***************
*** 69,73 ****
  void BEvent<G>::handle_special_hold()
  {
! 	if (specialpress)
  		(g->*specialhold) ();
  }
--- 69,73 ----
  void BEvent<G>::handle_special_hold()
  {
! 	if (specialhold)
  		(g->*specialhold) ();
  }

--- area.cpp DELETED ---

--- area.h DELETED ---

--- gametest.cpp DELETED ---

--- gametest.h DELETED ---

[Timewarp-commit] source/other gevent.cpp,1.4,1.5 gevent.h,1.4,1.5 gquest.cpp,1.8,1.9 gquest.h,1.5,1.6

[<yu...@pr...>]

Update of /cvsroot/timewarp/source/other
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1506/source/other

Modified Files:
	gevent.cpp gevent.h gquest.cpp gquest.h 
Log Message:
Quest Source

Index: gevent.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/gevent.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gevent.cpp	19 Jan 2004 19:15:37 -0000	1.4
--- gevent.cpp	24 Jan 2004 21:02:44 -0000	1.5
***************
*** 35,38 ****
--- 35,59 ----
  }
  
+ unsigned int EventCleanQuestTrash::GetEventType()
+ {
+ 	return GAME_EVENT_CLEANQUESTTRASH;
+ }
+ 
+ unsigned int EventQuestSuccess::GetEventType()
+ {
+ 	return GAME_EVENT_QUESTSUCCESS;
+ }
+ 
+ unsigned int EventQuestFailed::GetEventType()
+ {
+ 	return GAME_EVENT_QUESTFAILED;
+ }
+ 
+ unsigned int EventAskForQuest::GetEventType()
+ {
+ 	return GAME_EVENT_ASKFORQUEST;
+ }
+ 
+ 
  EventListner::EventListner()
  {

Index: gevent.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/gevent.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gevent.h	19 Jan 2004 19:15:37 -0000	1.4
--- gevent.h	24 Jan 2004 21:03:46 -0000	1.5
***************
*** 16,19 ****
--- 16,20 ----
  class GobPlayer;
  class GobStation;
+ class Quest;
  
  enum EventTypes
***************
*** 22,26 ****
      GAME_EVENT_SHIP_DIE,
      GAME_EVENT_SHIP_GET_DAMAGE,
! 	GAME_EVENT_ENTER_STATION,
    };
  
--- 23,31 ----
      GAME_EVENT_SHIP_DIE,
      GAME_EVENT_SHIP_GET_DAMAGE,
!     GAME_EVENT_ENTER_STATION,
!     GAME_EVENT_CLEANQUESTTRASH,
!     GAME_EVENT_QUESTSUCCESS,
!     GAME_EVENT_QUESTFAILED,
!     GAME_EVENT_ASKFORQUEST,
    };
  
***************
*** 34,42 ****
  {
   public:
! 	 EventShipDie();
! 
    Ship * victim;
    GobPlayer * player_killer;
! 	 virtual unsigned int GetEventType();
  };
  
--- 39,47 ----
  {
   public:
!   EventShipDie();
!   
    Ship * victim;
    GobPlayer * player_killer;
!   virtual unsigned int GetEventType();
  };
  
***************
*** 44,60 ****
  {
  public:
! 	Ship * ship;
! 	int total;
! 
! 	virtual unsigned int GetEventType();
  };
  
  class EventEnterStation: public IEvent
  {	
! public:
! 	GobStation* station;
! 	GobPlayer* player;
! 	
! 	virtual unsigned int GetEventType();
  };
  
--- 49,92 ----
  {
  public:
!   Ship * ship;
!   int total;
!   
!   virtual unsigned int GetEventType();
  };
  
  class EventEnterStation: public IEvent
  {	
!  public:
!   GobStation* station;
!   GobPlayer* player;
!   
!   virtual unsigned int GetEventType();
! };
! 
! class EventCleanQuestTrash: IEvent
! {
!  public:
!   virtual unsigned int GetEventType();
! };
! 
! class EventQuestSuccess: IEvent
! {
!  public:
!   Quest* quest;
!   virtual unsigned int GetEventType();
! };
! 
! class EventQuestFailed: IEvent
! {
!  public:
!   Quest* quest;
!   virtual unsigned int GetEventType();
! };
! 
! class EventAskForQuest: IEvent
! {
!  public:
!   GobPlayer* player;
!   virtual unsigned int GetEventType();
  };
  

Index: gquest.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/gquest.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gquest.cpp	19 Jan 2004 19:15:37 -0000	1.8
--- gquest.cpp	24 Jan 2004 21:03:47 -0000	1.9
***************
*** 14,23 ****
  #define gobgame ((GobGame*)game)
  
! #define NOT_IMPLEMENTED 0
  
  Quest::Quest( const char * szLuaFile, GobPlayer * player )
  {
    gob_player = player;
!   
    bExist = true;
  
--- 14,24 ----
  #define gobgame ((GobGame*)game)
  
! #define NOT_IMPLEMENTED 300
  
  Quest::Quest( const char * szLuaFile, GobPlayer * player )
  {
    gob_player = player;
!   strName = szLuaFile;
! 
    bExist = true;
  
***************
*** 66,69 ****
--- 67,75 ----
  }
  
+ const char * Quest::GetName() const
+ {
+ 	return strName.c_str();
+ }
+ 
  void Quest::Process()
  {
***************
*** 132,174 ****
        break;
      case GAME_EVENT_SHIP_DIE:
! 		// Test Implementation
! 		top = lua_gettop(L);
! 		lua_pushstring ( L, "GAME_EVENT_SHIP_DIE" );
! 		lua_gettable   ( L, LUA_GLOBALSINDEX );
! 
! 
! 		if ( !lua_isfunction(L, -1) )
! 		{
! 			tw_error("Quest script is not contain GAME_EVENT_SHIP_DIE function");
! 		};
! 		temp = ((EventShipDie*)event)->victim->get_shiptype() -> id;
! 		lua_pushstring( L, ((EventShipDie*)event)->victim->get_shiptype() -> id ); //reserved
! 		
! 		lua_call(L, 1, 0 );
! 		lua_settop(L, top);
        break;
      case GAME_EVENT_SHIP_GET_DAMAGE:
        break;
! 	case GAME_EVENT_ENTER_STATION:
! 		// Test Implementation
! 		top = lua_gettop(L);
! 		lua_pushstring ( L, "GAME_EVENT_ENTER_STATION" );
! 		lua_gettable   ( L, LUA_GLOBALSINDEX );
! 
! 		if ( !lua_isfunction(L, -1) )
! 		{
! 			tw_error("Quest script is not contain GAME_EVENT_ENTER_STATION function");
! 		};
! 
! 		lua_pushnumber( L, 1 ); //need to be implemented
! 		
! 		lua_call(L, 1, 0 );
! 		lua_settop(L, top);
! 
! 		break;
      default:
        break;
      }
! 	g_player = NULL;
  }
  
--- 138,180 ----
        break;
      case GAME_EVENT_SHIP_DIE:
!       // Test Implementation
!       top = lua_gettop(L);
!       lua_pushstring ( L, "GAME_EVENT_SHIP_DIE" );
!       lua_gettable   ( L, LUA_GLOBALSINDEX );
!       
!       
!       if ( !lua_isfunction(L, -1) )
! 	{
! 	  tw_error("Quest script is not contain GAME_EVENT_SHIP_DIE function");
! 	};
!       temp = ((EventShipDie*)event)->victim->get_shiptype() -> id;
!       lua_pushstring( L, ((EventShipDie*)event)->victim->get_shiptype() -> id ); //reserved
!       
!       lua_call(L, 1, 0 );
!       lua_settop(L, top);
        break;
      case GAME_EVENT_SHIP_GET_DAMAGE:
        break;
!     case GAME_EVENT_ENTER_STATION:
!       // Test Implementation
!       top = lua_gettop(L);
!       lua_pushstring ( L, "GAME_EVENT_ENTER_STATION" );
!       lua_gettable   ( L, LUA_GLOBALSINDEX );
!       
!       if ( !lua_isfunction(L, -1) )
! 	{
! 	  tw_error("Quest script is not contain GAME_EVENT_ENTER_STATION function");
! 	};
!       
!       lua_pushnumber( L, 1 ); //need to be implemented
!       
!       lua_call(L, 1, 0 );
!       lua_settop(L, top);
!       
!       break;
      default:
        break;
      }
!   g_player = NULL;
  }
  
***************
*** 200,235 ****
  }
  
! int QuestSource::LoadQuestList ( const char* qlist )
  {
!   return NOT_IMPLEMENTED;
  }
  
! StarBaseQuestSource::StarBaseQuestSource( const char* qlist )
  {
!   LoadQuestList( qlist );
  }
  
! StarBaseQuestSource::~StarBaseQuestSource()
  {
  }
  
! int StarBaseQuestSource::GetNextQuest(Quest* q, GobPlayer* p)
  {
!   return NOT_IMPLEMENTED;
  }
  
! int StarBaseQuestSource::QuestSuccess(Quest* q, GobPlayer* p)
  {
!   return NOT_IMPLEMENTED;
  }
  
! int StarBaseQuestSource::QuestFailed(Quest* q, GobPlayer* p)
  {
!   return NOT_IMPLEMENTED;
  }
  
! int StarBaseQuestSource::WhenMeet(GobPlayer* p)
  {
!   return NOT_IMPLEMENTED;
  }
  
--- 206,377 ----
  }
  
! QuestSource::QuestSource()
! { 
!   Lquest = lua_open();
! 
!   // Register C function
!   //lua_register(L, "RemoveObject",  l_RemoveObject);
! 
!   RegisterEvent (GAME_EVENT_CLEANQUESTTRASH, gobgame); // can't generate from quest
!   RegisterEvent (GAME_EVENT_QUESTSUCCESS, gobgame );
!   RegisterEvent (GAME_EVENT_QUESTFAILED, gobgame );
!   RegisterEvent (GAME_EVENT_ASKFORQUEST, gobgame );
! }
! 
! QuestSource::~QuestSource()
  {
!   lua_close( Lquest );
  }
  
! 
! int QuestSource::LoadQuestList ( const char* qlist )
  {
!   lua_dofile ( Lquest, qlist );
! 
!   int top  = lua_gettop ( Lquest );
!   lua_pushstring ( Lquest, "QuestSuccess" );
!   lua_gettable   ( Lquest, LUA_GLOBALSINDEX );
!   
!   if ( !lua_isfunction(Lquest, -1) )
!     {
!       tw_error("QuestSuccess failed");
!     };
!   lua_pushstring ( Lquest, "QuestFailed" );
!   lua_gettable   ( Lquest, LUA_GLOBALSINDEX );
!   
!   if ( !lua_isfunction(Lquest, -1) )
!     {
!       tw_error("QuestSuccess failed");
!     };
!   lua_pushstring ( Lquest, "GetNextQuest" );
!   lua_gettable   ( Lquest, LUA_GLOBALSINDEX );
!   
!   if ( !lua_isfunction(Lquest, -1) )
!     {
!       tw_error("GetNextQuest failed");
!     };
! 
!   lua_pushstring ( Lquest, "GetQuest" );
!   lua_gettable   ( Lquest, LUA_GLOBALSINDEX );
!   
!   if ( !lua_isfunction(Lquest, -1) )
!     {
!       tw_error("QuestSuccess failed");
!     };
!   return true;
  }
  
! Quest* QuestSource::GetNextQuest( GobPlayer* p)
  {
+   int top = lua_gettop(Lquest);
+   lua_pushstring ( Lquest, "GetNextQuest" );
+   lua_gettable   ( Lquest, LUA_GLOBALSINDEX );
+   
+   if ( !lua_isfunction(Lquest, -1) )
+     {
+       tw_error("GetNextQuest failed");
+     };
+   
+   lua_call(Lquest, 0, 1 );
+   
+   if ( !lua_isstring(Lquest, -1) )
+     {
+       tw_error("Wrong argument for GetNextQuest");
+     }
+   
+   Quest * q = NULL;
+   const char * quest = lua_tostring(Lquest, -1);
+   if ( !strcmp(quest, "NO_QUEST") )
+     q = new Quest( quest, p );
+   questList.push_back(q);
+ 
+   lua_settop(Lquest, top);
+ 		
+   return q;
  }
  
! Quest* QuestSource::GetQuest ( const char * name, GobPlayer * player )
  {
!   ASSERT(name);
!   Quest * q = new Quest( name, player );
!   return q;
  }
  
! int QuestSource::QuestSuccess( Quest* q )
  {
!   int top = lua_gettop(Lquest);
!   lua_pushstring ( Lquest, "QuestSuccess" );
!   lua_gettable   ( Lquest, LUA_GLOBALSINDEX );
!   
!   if ( !lua_isfunction(Lquest, -1) )
!     {
!       tw_error("QuestSuccess failed");
!     };
! 
!   lua_pushstring( Lquest, q->GetName() );
!   
!   lua_call(Lquest, 1, 0 );
!   
!   lua_settop(Lquest, top);
!   
!   return 1;
  }
  
! int QuestSource::QuestFailed( Quest* q )
  {
! int top = lua_gettop(Lquest);
!   lua_pushstring ( Lquest, "QuestFailed" );
!   lua_gettable   ( Lquest, LUA_GLOBALSINDEX );
!   
!   if ( !lua_isfunction(Lquest, -1) )
!     {
!       tw_error("QuestSuccess failed");
!     };
!   
!   lua_pushstring( Lquest, q->GetName() );
!   
!   lua_call(Lquest, 1, 0 );
!   
!   lua_settop(Lquest, top);
! 		
!   return 1;
  }
  
! void QuestSource::RemoveTrash()
  {
!   for (std::list<Quest*>::iterator i = questList.begin();
! 	 i != questList.end(); i++)
!     {
!       if ( !((*i)->exist()) )
! 	{
! 	  delete *i;
! 	  questList.erase(i);
! 	}
!     }
  }
  
+ void QuestSource::ProcessEvent ( IEvent* event )
+ {
+   int type = event->GetEventType();
+   switch ( type )
+     {
+     case GAME_EVENT_ALL:
+       {tw_error ("Process Event failed");}
+       break;
+ 
+     case GAME_EVENT_CLEANQUESTTRASH:
+       RemoveTrash();
+       break;
+     case GAME_EVENT_QUESTSUCCESS:
+       QuestSuccess( ((EventQuestSuccess*)event)->quest );
+       break;
+     case GAME_EVENT_QUESTFAILED:
+       QuestFailed( ((EventQuestFailed*)event)->quest );
+       break;
+     case GAME_EVENT_ASKFORQUEST:
+       GetNextQuest( ((EventAskForQuest*)event)->player );
+       break;
+     default:
+       break;
+     }
+ }

Index: gquest.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/gquest.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gquest.h	19 Jan 2004 19:15:37 -0000	1.5
--- gquest.h	24 Jan 2004 21:04:04 -0000	1.6
***************
*** 8,13 ****
--- 8,17 ----
  }
  
+ #include <string>
+ #include <list>
+ 
  #include "gevent.h"
  
+ 
  class GobPlayer;
  
***************
*** 18,22 ****
    lua_State * L;
    GobPlayer * gob_player;
!  
   public:
    Quest( const char * szLuaFile, GobPlayer * player );
--- 22,27 ----
    lua_State * L;
    GobPlayer * gob_player;
!   std::string strName;
! 
   public:
    Quest( const char * szLuaFile, GobPlayer * player );
***************
*** 27,31 ****
    void Process();
    bool exist();
!   
    /*! \brief Process Event */
    virtual void  ProcessEvent( IEvent* event);
--- 32,37 ----
    void Process();
    bool exist();
!   const char * GetName() const;
! 
    /*! \brief Process Event */
    virtual void  ProcessEvent( IEvent* event);
***************
*** 44,68 ****
  
  
! class QuestSource 
  {
   protected:
!   virtual int LoadQuestList( const char* qlist );
   public:
!   virtual int GetNextQuest(Quest* q, GobPlayer* p) = 0;
!   virtual int QuestSuccess(Quest* q, GobPlayer* p) = 0;
!   virtual int WhenMeet(GobPlayer* p) = 0;
  };
  
- class StarBaseQuestSource: public QuestSource
- {
-  public:
-   StarBaseQuestSource(const char* qlist);
-   virtual ~StarBaseQuestSource();
-   virtual int GetNextQuest(Quest* q, GobPlayer* p);
-   virtual int QuestSuccess(Quest* q, GobPlayer* p);
-   virtual int QuestFailed(Quest* q, GobPlayer* p);
-   virtual int WhenMeet(GobPlayer* p);
- 
- };
  
  #endif // __GQUEST_H__
--- 50,72 ----
  
  
! /*! \brief Intend to manage quests */
! class QuestSource : public EventListner
  {
   protected:
!   lua_State * Lquest;
!   std::list<Quest*> questList;
   public:
!   QuestSource();
!   virtual ~QuestSource();
!   virtual int LoadQuestList( const char* qlist );
!   virtual Quest* GetNextQuest( GobPlayer* p );
!   virtual Quest* GetQuest ( const char * name, GobPlayer* p );
!   virtual int QuestSuccess( Quest* q );
!   virtual int QuestFailed( Quest* q );
!   
!   virtual void RemoveTrash();
!   virtual void ProcessEvent(IEvent* event);
  };
  
  
  #endif // __GQUEST_H__

[Timewarp-commit] source/games ggob.cpp,1.19,1.20 ggob.h,1.9,1.10

[<yu...@pr...>]

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1506/source/games

Modified Files:
	ggob.cpp ggob.h 
Log Message:
Quest Source

Index: ggob.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ggob.cpp	19 Jan 2004 19:15:37 -0000	1.19
--- ggob.cpp	24 Jan 2004 21:04:05 -0000	1.20
***************
*** 770,774 ****
    mass = 99;
  
!   quest_source = new StarBaseQuestSource( qlist );
  }
  
--- 770,774 ----
    mass = 99;
  
!   quest_source = new QuestSource();
  }
  

Index: ggob.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ggob.h	17 Jan 2004 01:56:49 -0000	1.9
--- ggob.h	24 Jan 2004 21:04:46 -0000	1.10
***************
*** 122,126 ****
  	virtual void upgrade_menu(GobStation *station, GobPlayer *gs) ;
  	
! 	StarBaseQuestSource* quest_source;
  };
  
--- 122,126 ----
  	virtual void upgrade_menu(GobStation *station, GobPlayer *gs) ;
  	
! 	QuestSource* quest_source;
  };