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

[Timewarp-commit] TestQuest.lua,1.2,NONE

[<yu...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1:/tmp/cvs-serv5560

Removed Files:
	TestQuest.lua 
Log Message:
no message

[Timewarp-commit] gamedata pkunk-standing.bmp,NONE,1.1 TestQuest.lua,NONE,1.1

[<yu...@us...>]

Update of /cvsroot/timewarp/gamedata
In directory sc8-pr-cvs1:/tmp/cvs-serv5339

Added Files:
	pkunk-standing.bmp TestQuest.lua 
Log Message:
Data for GOB quest

--- NEW FILE: pkunk-standing.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: TestQuest.lua ---
Complited = 0;

function Process(time, enemy, kills, x, y, res_num1, res_num2, res_str)
--AddObject();
a = 1;
b = 2;
c = a + b;
end

DialogStart "gamedata/pkunk-standing.bmp"
function question1()
	DialogWrite "Hello, my spiritual child. I have no quest for you yet"
	answer = DialogAnswer("But I am realy need one!", 
			"Lets just talk a bit!!!",
			 "bye")
	if answer == 1 then return question2() end
	if answer == 2 then return question3() end
	if answer == 3 then return DialogWrite "Bye" end
end

function question2()
	DialogWrite "Sorry, this part of game is on very early development stage. But don't lose hope :)"
	answer = DialogAnswer("Ok, lets just talk then", "Bye")
	if answer == 1 then return question3() end
	if answer == 2 then return DialogWrite "Bye" end 
end

function question3()
	DialogWrite "And what are we doing now?"
	answer = DialogAnswer ("Testing!!!", "Bye")
	if answer == 1 then return DialogWrite ("Booring..."); end
	if answer == 2 then return question1() end
end

question1()

DialogEnd()

[Timewarp-commit] twwin.dsp,1.54,1.55

[<yu...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1:/tmp/cvs-serv5156

Modified Files:
	twwin.dsp 
Log Message:
no message

[Timewarp-commit] source/other gdialog.cpp,1.1,1.2 gdialog.h,1.1,1.2 gquest.cpp,1.1,1.2 gquest.h,1.1,1.2

[<yu...@us...>]

Update of /cvsroot/timewarp/source/other
In directory sc8-pr-cvs1:/tmp/cvs-serv5066/source/other

Modified Files:
	gdialog.cpp gdialog.h gquest.cpp gquest.h 
Log Message:
Updated quest system

Index: gdialog.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/gdialog.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gdialog.cpp	13 Jan 2004 01:19:26 -0000	1.1
--- gdialog.cpp	14 Jan 2004 11:12:32 -0000	1.2
***************
*** 13,40 ****
  #include "util/aastr.h"
  
! static GobGame * g_game = NULL;
  
  /*! \brief Alien Picture */
  static BITMAP * g_btmAlien = NULL;
  static BITMAP * g_btmOld = NULL;
  
  
! static int alien_image_x = SCREEN_W;
! static int alien_image_y = SCREEN_H/2;
! 
! void InitConversationModule ( lua_State* L, GobGame * game )
  {
!   ASSERT ( game == NULL);
!   g_game = game;
  
    /////////////////////////////////////////////////////////
    // Register C function for using in lua
    ////////////////////////////////////////////////////////
!   lua_register(L, "DialogStart", l_DialogStart);
    lua_register(L, "DialogSetAlienImage", l_DialogSetAlienImage);
!   lua_register(L, "DialogWrite", l_DialogWrite);
!   lua_register(L, "DialogAnswer", l_DialogAnswer);
!   lua_register(L, "DialogEnd", l_DialogEnd );
!   /////////////////////////////////////////////////////////  
  }
  
--- 13,41 ----
  #include "util/aastr.h"
  
! #define gobgame ((GobGame*)game)
  
  /*! \brief Alien Picture */
  static BITMAP * g_btmAlien = NULL;
  static BITMAP * g_btmOld = NULL;
+ bool g_bPause = false;
  
+ static int alien_image_x = 0;
+ static int alien_image_y = 0;
  
! void InitConversationModule ( lua_State* L )
  {
! 	ASSERT ( L != NULL );
!   alien_image_x = SCREEN_W;
!   alien_image_y = SCREEN_H/2;
  
    /////////////////////////////////////////////////////////
    // Register C function for using in lua
    ////////////////////////////////////////////////////////
!   lua_register(L, "DialogStart",         l_DialogStart);
    lua_register(L, "DialogSetAlienImage", l_DialogSetAlienImage);
!   lua_register(L, "DialogWrite",         l_DialogWrite);
!   lua_register(L, "DialogAnswer",        l_DialogAnswer);
!   lua_register(L, "DialogEnd",           l_DialogEnd );
!   
  }
  
***************
*** 44,60 ****
  int l_DialogStart(lua_State* ls)
  {
!   ASSERT ( g_game == NULL );
!   ASSERT ( g_btmAlien != NULL && "New StartDialog was called before DialogEnd"); 
!   ASSERT ( g_btmOld != NULL && "New StartDialog was called before DialogEnd"); 
  
!   //g_game->pause();
    
!   g_game->window->lock();
!   g_btmOld = create_bitmap( g_game->window->surface->w, 
! 			    g_game->window->surface->h );
!   blit( g_game->window->surface, g_btmOld, 0, 0, 0, 0, 
! 	g_game->window->surface->w,
! 	g_game->window->surface->h );
!   g_game->window->unlock();
  
    return l_DialogSetAlienImage(ls);
--- 45,66 ----
  int l_DialogStart(lua_State* ls)
  {
!   ASSERT ( g_btmAlien == NULL && "New StartDialog was called before DialogEnd"); 
!   ASSERT ( g_btmOld   == NULL && "New StartDialog was called before DialogEnd"); 
  
!    if ( !game->is_paused() )
!    {
! 	    g_bPause = false;
! 		game->pause();
!    }
!    else 
! 	   g_bPause = true;
    
!   g_btmOld = create_bitmap( game->window->surface->w, 
! 			    game->window->surface->h );
!   game->window->lock();
!   blit( game->window->surface, g_btmOld, 0, 0, 0, 0, 
! 	game->window->surface->w,
! 	game->window->surface->h );
!   game->window->unlock();
  
    return l_DialogSetAlienImage(ls);
***************
*** 75,80 ****
      }
  
-    BITMAP *temp = load_bitmap( text, NULL);
     aa_set_mode(AA_DITHER);
     ASSERT(temp);
     g_btmAlien = create_bitmap(alien_image_x, alien_image_y);
--- 81,88 ----
      }
  
     aa_set_mode(AA_DITHER);
+    clear_bitmap ( game->window->surface );
+    BITMAP *temp = load_bitmap( text, NULL);
+    
     ASSERT(temp);
     g_btmAlien = create_bitmap(alien_image_x, alien_image_y);
***************
*** 83,90 ****
     destroy_bitmap(temp);
  
!    g_game->window->lock();
!    blit(g_btmAlien, g_game->window->surface, 0, 0, 0, 0, 
  	alien_image_x, 	alien_image_y);
!    g_game->window->unlock();
     return 0;
  }
--- 91,98 ----
     destroy_bitmap(temp);
  
!    game->window->lock();
!    blit(g_btmAlien, game->window->surface, 0, 0, 0, 0, 
  	alien_image_x, 	alien_image_y);
!    game->window->unlock();
     return 0;
  }
***************
*** 92,97 ****
  int l_DialogWrite(lua_State* ls)
  {
!   g_game->window->lock();
!   blit(g_btmAlien, screen, 0, 0, 0, 0, alien_image_x, alien_image_y);
      
    if ( !lua_isstring(ls, 1) )
--- 100,105 ----
  int l_DialogWrite(lua_State* ls)
  {
!   game->window->lock();
!   blit(g_btmAlien, game->window->surface, 0, 0, 0, 0, alien_image_x, alien_image_y);
      
    if ( !lua_isstring(ls, 1) )
***************
*** 101,106 ****
    const char* text = lua_tostring(ls, 1);
  
!   textout(g_game->window->surface, font, text, 10, 10, -1);
!   g_game->window->unlock();
    return 0;
  }
--- 109,114 ----
    const char* text = lua_tostring(ls, 1);
  
!   textout(game->window->surface, font, text, 10, 10, -1);
!   game->window->unlock();
    return 0;
  }
***************
*** 128,135 ****
--- 136,146 ----
    pMenuAnswers[num].dp     = NULL;
    
+   show_mouse(game->window->surface);
    int ret = -1;
    while( ret == -1 )
      ret = do_menu(pMenuAnswers, 0, screen->h/2);
    ret++;
+   show_mouse(NULL);
+ 
    ///////////////////////////////////////////////
    //Free memory
***************
*** 144,158 ****
  {
    // restore pre-dialog image
!   g_game->window->lock();
!   blit( g_btmOld, g_game->window->surface, 0, 0, 0, 0, g_btmOld->w, g_btmOld->h );
    destroy_bitmap( g_btmOld );
!   g_game->window->unlock();
    g_btmOld = NULL;
    
-   // destroy alien picture
-   //destroy_bitmap( g_btmAlien );
-   //g_btmAlien = NULL;
    
! //  g_game->unpause();
  
    return 0;
--- 155,171 ----
  {
    // restore pre-dialog image
!   game->window->lock();
!   blit( g_btmOld, game->window->surface, 0, 0, 0, 0, g_btmOld->w, g_btmOld->h );
    destroy_bitmap( g_btmOld );
!   game->window->unlock();
    g_btmOld = NULL;
    
    
!   // destroy alien picture
!   destroy_bitmap( g_btmAlien );
!   g_btmAlien = NULL;
! 
!   if( !g_bPause )
! 	  game->unpause();
  
    return 0;

Index: gdialog.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/gdialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gdialog.h	13 Jan 2004 01:19:26 -0000	1.1
--- gdialog.h	14 Jan 2004 11:12:32 -0000	1.2
***************
*** 8,14 ****
  }
  
- class GobGame;
  
! void InitConversationModule ( lua_State* L, GobGame * game );
  
  int l_DialogStart(lua_State* ls);
--- 8,13 ----
  }
  
  
! void InitConversationModule ( lua_State* L  );
  
  int l_DialogStart(lua_State* ls);

Index: gquest.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/gquest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gquest.cpp	13 Jan 2004 01:19:26 -0000	1.1
--- gquest.cpp	14 Jan 2004 11:12:32 -0000	1.2
***************
*** 7,21 ****
  
  static GobPlayer * g_player = NULL;
! static GobGame * g_game = NULL;
  
! Quest::Quest( const char * szLuaFile, GobPlayer * player, GobGame * game )
  {
    gob_player = player;
-   gob_game = game;
    
    bExist = true;
  
    L = lua_open();
!   InitConversationModule( L, game );
  
    // Register C function
--- 7,21 ----
  
  static GobPlayer * g_player = NULL;
! #define gobgame ((GobGame*)game)
  
! 
! Quest::Quest( const char * szLuaFile, GobPlayer * player )
  {
    gob_player = player;
    
    bExist = true;
  
    L = lua_open();
!   InitConversationModule( L );
  
    // Register C function
***************
*** 39,44 ****
  void Quest::Process()
  {
    g_player = gob_player;
!   g_game = gob_game;
  
    int top = lua_gettop(L);
--- 39,49 ----
  void Quest::Process()
  {
+ 	// just to speed up game
+ 	if( random()%50 )
+ 		return;
+ 
+   // dirty hack, only for experiment
    g_player = gob_player;
!   
  
    int top = lua_gettop(L);
***************
*** 52,57 ****
  
    // gather information
!   int time = gob_game->game_time;
!   int enemy = gob_game->gobenemies;
    int kills = gob_player->kills;
    int x = iround(gob_player->ship->normal_pos().x);
--- 57,62 ----
  
    // gather information
!   int time = gobgame->game_time;
!   int enemy = gobgame->gobenemies;
    int kills = gob_player->kills;
    int x = iround(gob_player->ship->normal_pos().x);
***************
*** 91,95 ****
  int Quest::l_AddObject(lua_State* ls)
  {
!   g_game->add_new_enemy();
    return 0;
  }
--- 96,100 ----
  int Quest::l_AddObject(lua_State* ls)
  {
!   gobgame->add_new_enemy();
    return 0;
  }

Index: gquest.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/gquest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gquest.h	13 Jan 2004 01:19:27 -0000	1.1
--- gquest.h	14 Jan 2004 11:12:32 -0000	1.2
***************
*** 9,13 ****
  
  class GobPlayer;
! class GobGame;
  
  class Quest
--- 9,13 ----
  
  class GobPlayer;
! 
  
  class Quest
***************
*** 16,23 ****
    lua_State * L;
    GobPlayer * gob_player;
-   GobGame * gob_game;
   
   public:
!   Quest( const char * szLuaFile, GobPlayer * player, GobGame * game );
    virtual ~Quest();
      /*! \brief Summon default quest handler
--- 16,22 ----
    lua_State * L;
    GobPlayer * gob_player;
   
   public:
!   Quest( const char * szLuaFile, GobPlayer * player );
    virtual ~Quest();
      /*! \brief Summon default quest handler

[Timewarp-commit] source/games ggob.cpp,1.13,1.14 ggob.h,1.6,1.7

[<yu...@us...>]

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv5066/source/games

Modified Files:
	ggob.cpp ggob.h 
Log Message:
Updated quest system

Index: ggob.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ggob.cpp	13 Jan 2004 01:15:23 -0000	1.13
--- ggob.cpp	14 Jan 2004 11:12:32 -0000	1.14
***************
*** 551,556 ****
  	STACKTRACE
  
! 	  ggame = g;
! 	  quest.clear();
  	
  	channel = c->channel;
--- 551,555 ----
  	STACKTRACE
  
! 	quest.clear();
  	
  	channel = c->channel;
***************
*** 853,857 ****
  			break;
      case STATION_DIALOG_QUEST:
!       Quest * q = new Quest ( "TestQuest.lua", s, s->ggame );
        s->quest.push_back(q);
        break;
--- 852,857 ----
  			break;
      case STATION_DIALOG_QUEST:
! 		// experiment code
!       Quest * q = new Quest ( "gamedata/TestQuest.lua", s  );
        s->quest.push_back(q);
        break;

Index: ggob.h
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ggob.h	13 Jan 2004 01:15:23 -0000	1.6
--- ggob.h	14 Jan 2004 11:12:32 -0000	1.7
***************
*** 21,25 ****
  	public:
    std::list<Quest*> quest;
-   GobGame * ggame;
  
  	int channel;
--- 21,24 ----

[Timewarp-commit] source/games gluagame.cpp,1.2,1.3

[<you...@us...>]

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv4726/source/games

Modified Files:
	gluagame.cpp 
Log Message:
continuing with lua tests

Index: gluagame.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gluagame.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gluagame.cpp	13 Jan 2004 01:15:23 -0000	1.2
--- gluagame.cpp	14 Jan 2004 07:41:57 -0000	1.3
***************
*** 1,20 ****
! /*
! 
! This file contains sample games 1, 2, & 3, otherwise known as 
! Arena, Double Arena, and Eternal Arena.  These demonstrate some 
! basics of how to create a Game type in Star Control: TimeWarp
! 
  */
  
  
- /* 
- TimeWarp Sample Game 1: Arena
- This demonstrates how to create a new Game type
- 
- For this game, we'll just have a bunch of ships fighting 
- the human player.  
- */
- 
- //first, we #include the files we need.  library headers go first, then melee.h, then any other pieces of TW we need to refer to
  
  #include <allegro.h> //allegro library header
--- 1,8 ----
! /**
!   gametype to test out how Lua and C++ and Timewarp get along.
!   Very experimental.
  */
  
  
  
  #include <allegro.h> //allegro library header
***************
*** 32,35 ****
--- 20,25 ----
  #include "melee/mfleet.h"   //fleets...
  
+ #include "melee/manim.h"
+ 
  extern "C" {
    #include <lua.h>
***************
*** 39,47 ****
  
  
  class LuaGame : public Game { //declaring our game type
  	virtual void init(Log *_log) ; //happens when our game is first started
      lua_State *L;
      virtual void LuaGame::quit(const char *message);
! 	};
  
  void LuaGame::init(Log *_log) {
--- 29,121 ----
  
  
+ #define lua_register2(L,n,f) \
+                (lua_pushstring(L, n), \
+                 lua_pushcfunction(L, f), \
+                 lua_settable(L, LUA_GLOBALSINDEX))
+      /* lua_State *L;    */
+      /* const char *n;   */
+      /* lua_CFunction f; */
+ 
  class LuaGame : public Game { //declaring our game type
  	virtual void init(Log *_log) ; //happens when our game is first started
      lua_State *L;
      virtual void LuaGame::quit(const char *message);
! };
! 
! LuaGame * globalLuaGame = NULL;
! 
! class SpecialAsteroid : public Asteroid {
!     char name[80];
! 
!    public:
!     SpecialAsteroid(const char * Name) :
!     Asteroid()
!     {
!         strncpy(name, Name, 80);
!     }
! 
!     void death() {
!         //GOOD OO
!         //Asteroid::death();
!         
!         //BAD OO
!         Animation *a = new Animation(this, pos,
!             explosion, 0, explosion->frames(), time_ratio, get_depth());
!         a->match_velocity(this);
!         game->add(a);
!         message.print(1000,15,"You blew up a special asteroid named: \"%s\" which won't respawn", name);
!     }
! };
! 
! 
! int addAsteroid(lua_State * L) {
!     int args = lua_gettop(L);    // number of arguments 
! 
!     if (args == 1) {
!         globalLuaGame->add(new SpecialAsteroid(lua_tostring(L,-1)));
!         lua_pop(L,1);
!     }
!     else
!     {
!         globalLuaGame->add(new Asteroid());
!     }
!     return 0;
! }
! 
! int addPlanet(lua_State * L) {
! 
!     int args = lua_gettop(L);    // number of arguments 
!     if (args != 2)
!         return 0; // TODO prevent stack overflow
! 
!     if ( ! lua_isnumber(L, -1) ||
!          ! lua_isnumber(L, -2) )
!          return 0; // TODO prevent stack overflow
! 
!     double x = lua_tonumber(L, -1);
!     lua_pop(L, 1);
!     double y = lua_tonumber(L, -1);
!     lua_pop(L, 1);
! 
!     Vector2 v(x, y);
!     Planet * planet = create_planet(v);
!     //globalLuaGame->add( planet );
! 
!     return 0;
! }
! 
! /** Adds an asteroid to the game environment.  As a Lua call, the prototype is:
! 
!     NOT TRUE YET:
!       //addAsteroid(x,y)
!     // @param x the x coordinate of the asteroid
!     // @param y the y coordinate of the asteroid
!     /NOT TRUE YET:
! */
! //int LuaGame::addAsteroid(lua_State * state) {
! //    globalLuaGame.add(new Asteroid());
! //   return 0;
! //}
! 
  
  void LuaGame::init(Log *_log) {
***************
*** 61,64 ****
--- 135,145 ----
      luaopen_math(L);
      luaopen_debug(L);
+ 
+     //terrible hack, only for experimental use!!!
+     //TODO remove this
+     globalLuaGame = this;
+ 
+     lua_register(L, "addAsteroid", addAsteroid);
+     lua_register(L, "addPlanet", addPlanet);
      
      
***************
*** 66,69 ****
--- 147,151 ----
      sprintf(str, "loading file returned %i\n", lua_dofile(L, "./source/games/luatest/bridge.lua"));
      message.out(str, 3500, 15);
+ 
      
       
***************
*** 71,80 ****
  	add(new Stars());
  
- 	// declare an integer we can use for whatever we might need an integer for
- 	int i; 
- 	for (i = 0; i < 3; i += 1) { //this causes the next stuff to happen 3 times
- 		add(new Asteroid()); //this adds an asteroid to the game
- 		} //so there will be 3 asteroids (asteroids automatically create new asteroids when they die...)
- 
  	//first, we create the teams.  This battle has just 2 sides; the human player, and the AI enemies
  	TeamCode human, enemies;
--- 153,156 ----
***************
*** 89,156 ****
  	//this creates a ship
  	Ship *s = create_ship("plopl", c, Vector2(size.x/2,size.y/2), 0, human);
- 	//the 1st parameter is a 5-letter ship code.  e.g. plopl = Ploxis Plunderer, andgu = Androsynth Guardian, chmav = Chmmr Avatar, estgu = Estion Gunner, tauhu = Tau Hunter, thrto = Thraddash Torch
- 	//the 2nd parameter is the controller for the ship.  
- 	//the 3th parameter is the positition where it appears.  
- 	//the 4th parameter is the angle that the ship starts out facing (in radians), 0 in this case, meaning that it points to the right
- 	//Note that angles in radians range from 0 to 2 * PI (6.283...), unlike angles in degrees which range from 0 to 360
- 	//You can convert degrees to radians by multiplying by ANGLE_RATIO
- 	//the 5th parameter is the team it's on... this parameter is optional... if we leave it out, then it's on it's own team of 1, and everyone is its enemy
- 
- 	//I should talk more about the 3rd parametere there, the position
- 	//The idea of the position is simple: an X coordinate and a Y coordinate
- 	//The X & Y coordinates indicate a point in space.  
- 	//The ship is placed with its center at that point.  
- 	//However, even though it's 2 coordinates, it's only one parameter
- 	//That's because create_ship takes a 2-dimensional vector (the type for which is called Vector2 in TimeWarp)
- 	//the vector contains the X & Y coordinates.  
- 	//There are many other functions in TimeWarp that take vectors. 
- 	//When you want to pass one of those functions a constant like x=13.5,y=7.9, you give them Vector2(13.5, 7.9)
- 	//When you recieve a Vector2 and want to know what the x or y component of it are , you append .x or .y to the end of it to get those components
- 	//In the above example I said "Vector2(size.x/2,size.y/2)"
- 	//but it would have been equivalent to just say "size/2"
  
  	//this causes the ship to warp into the game.  note that we call add() on the phaser, not the ship, because the phaser will add the ship once it finishes warping in
  	add(s->get_ship_phaser());
! 	//if we wanted the ship to just appear without warping in, then we would say "add(s);" instead
! 
! 	//this causes the human ship to be a focus for the camera
  	add_focus(s);
- 
- 	//now, we create some enemies to fight
- 
- /*	Ship *e;
- 	e = create_ship(channel_none, "kzedr", "WussieBot", Vector2(size.x/4,size.y/4), random(PI2), enemies);
- 	//This is a different syntax for create_ship
- 	//It creates a ship and an AI for it at the same time.  
- 	//AIs created in this way are automatically destroyed when their ship dies
- 	//Notice how it takes the parameters normally taken by both a create_control and a create_ship
- 	//Anyway, this creates a Kzer-Za Dreadnought, and WussieBot AI to control it
- 	//This ship starts facing a random direction from 0 to 2 * PI radians, because of the "random(PI2)"
- 	//PI2 is shorthand for 2 * PI in timewarp.  In timewarp, random(x) will produce a random number from 0 to x
- 	//Notice that it's on channel channel_none.  This mean that the AI is considered part of physics and uses no bandwidth in network games
- 	//When AIs use channel_none they are not effected by network lag.  
- 	//You can also use a channel_server or channel_client, to locate the AI on the server or client computer.  
- 	//If you do so the AI will experience lag and use network bandwidth just like a human player
- 	add(e->get_ship_phaser());
- 	e = create_ship(channel_none, "kohma", "WussieBot", Vector2(size.x*3/4,size.y/4), random(PI2), enemies);
- 	//here we add a Kohr-Ah Marauder
- 	add(e->get_ship_phaser());
- 	e = create_ship(channel_none, "druma", "WussieBot", Vector2(size.x*3/4,size.y*3/4), random(PI2), enemies);
- 	//here we add a Druuge Mauler
- 	add(e->get_ship_phaser());
- 	e = create_ship(channel_none, "yehte", "WussieBot", Vector2(size.x/4,size.y*3/4), random(PI2), enemies);
- 	//here we add a Yehat Terminator
- 	add(e->get_ship_phaser());
- 
- */
- 	//BTW, this is a vicious combination of enemies.  
- 	//Yehat for direct assault, Druuge for long range support, 
- 	//and the Urquans to make life miserable
- 
- 	//message.out("Welcome to Sample Game 1: Arena!", 3500, 15);
- 	//display a welcoming message to the player
- 	//the message is displayed for 3500 milliseconds (3.5 seconds)
- 	//in color 15 of the standard TW palette, which is white
- 
  	}
  
--- 165,173 ----
  	//this creates a ship
  	Ship *s = create_ship("plopl", c, Vector2(size.x/2,size.y/2), 0, human);
  
  	//this causes the ship to warp into the game.  note that we call add() on the phaser, not the ship, because the phaser will add the ship once it finishes warping in
  	add(s->get_ship_phaser());
!     //add(s);
  	add_focus(s);
  	}
  

[Timewarp-commit] source/games/luatest bridge.lua,1.1,1.2

[<you...@us...>]

Update of /cvsroot/timewarp/source/games/luatest
In directory sc8-pr-cvs1:/tmp/cvs-serv4726/source/games/luatest

Modified Files:
	bridge.lua 
Log Message:
continuing with lua tests

Index: bridge.lua
===================================================================
RCS file: /cvsroot/timewarp/source/games/luatest/bridge.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bridge.lua	10 Jan 2004 20:26:34 -0000	1.1
--- bridge.lua	14 Jan 2004 07:41:57 -0000	1.2
***************
*** 4,16 ****
  
  
! require "StarClasses"
! require "SampleUniverse"
  
- local player1 = Player:new()
  
  
- local abc = "abc"
  
- print ("ASDFASDF")
  
  
--- 4,33 ----
  
  
! --require "StarClasses"
! --require "SampleUniverse"
! 
! addAsteroid();
! addAsteroid();
! addAsteroid();
! 
! addAsteroid("Wakko");
! addAsteroid("Yakko");
! addAsteroid("Dot");
! 
! 
! 
! addPlanet(100,100);
! --addPlanet(150,150);
! --addPlanet(200,200);
! --addPlanet(250,250);
! 
! 
! 
! 
! 
  
  
  
  
  
  

[Timewarp-commit] client.ini,1.26,1.27

[<you...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1:/tmp/cvs-serv32748

Modified Files:
	client.ini 
Log Message:
turning on music

[Timewarp-commit] twwin.dsp,1.53,1.54

[<yu...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1:/tmp/cvs-serv13392

Modified Files:
	twwin.dsp 
Log Message:
fixed project file to properly set include directories (used commas to seperate directories in the textbox in the project settings)
Again, hate VS project settings :)

[Timewarp-commit] twwin.dsp,1.52,1.53

[<you...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1:/tmp/cvs-serv28284

Modified Files:
	twwin.dsp 
Log Message:
fixed project file to properly set include directories (used commas to seperate directories in the textbox in the project settings)

[Timewarp-commit] twwin.dsp,1.51,1.52

[<yu...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1:/tmp/cvs-serv12584

Modified Files:
	twwin.dsp 
Log Message:
Added Dialog system to GOB quests, pretty buggy :)

[Timewarp-commit] source/other gdialog.cpp,NONE,1.1 gdialog.h,NONE,1.1 gquest.cpp,NONE,1.1 gquest.h,NONE,1.1

[<yu...@us...>]

Update of /cvsroot/timewarp/source/other
In directory sc8-pr-cvs1:/tmp/cvs-serv12528

Added Files:
	gdialog.cpp gdialog.h gquest.cpp gquest.h 
Log Message:
Added Dialog system to GOB quests, pretty buggy :)

--- NEW FILE: gdialog.cpp ---
/*
 *        Conversation module for GOB
 * (C) Yura Semashko aka Yurand <yu...@la...>
 *
 */

#include <allegro.h>

#include "gdialog.h"
#include "games/ggob.h"

#include "util/aautil.h"
#include "util/aastr.h"

static GobGame * g_game = NULL;

/*! \brief Alien Picture */
static BITMAP * g_btmAlien = NULL;
static BITMAP * g_btmOld = NULL;


static int alien_image_x = SCREEN_W;
static int alien_image_y = SCREEN_H/2;

void InitConversationModule ( lua_State* L, GobGame * game )
{
  ASSERT ( game == NULL);
  g_game = game;

  /////////////////////////////////////////////////////////
  // Register C function for using in lua
  ////////////////////////////////////////////////////////
  lua_register(L, "DialogStart", l_DialogStart);
  lua_register(L, "DialogSetAlienImage", l_DialogSetAlienImage);
  lua_register(L, "DialogWrite", l_DialogWrite);
  lua_register(L, "DialogAnswer", l_DialogAnswer);
  lua_register(L, "DialogEnd", l_DialogEnd );
  /////////////////////////////////////////////////////////  
}

////////////////////////////////////////////////////////////////////////////
//Lua function implementation
///////////////////////////////////////////////////////////////////////////
int l_DialogStart(lua_State* ls)
{
  ASSERT ( g_game == NULL );
  ASSERT ( g_btmAlien != NULL && "New StartDialog was called before DialogEnd"); 
  ASSERT ( g_btmOld != NULL && "New StartDialog was called before DialogEnd"); 

  //g_game->pause();
  
  g_game->window->lock();
  g_btmOld = create_bitmap( g_game->window->surface->w, 
			    g_game->window->surface->h );
  blit( g_game->window->surface, g_btmOld, 0, 0, 0, 0, 
	g_game->window->surface->w,
	g_game->window->surface->h );
  g_game->window->unlock();

  return l_DialogSetAlienImage(ls);
}

int l_DialogSetAlienImage(lua_State* ls)
{
  if ( !lua_isstring(ls, 1) )
    {
      tw_error("SetAlienImage was summoned without image string");
    }

  const char* text = lua_tostring(ls, 1);
  if(g_btmAlien)
    {
      destroy_bitmap(g_btmAlien);
      g_btmAlien = NULL;
    }

   BITMAP *temp = load_bitmap( text, NULL);
   aa_set_mode(AA_DITHER);
   ASSERT(temp);
   g_btmAlien = create_bitmap(alien_image_x, alien_image_y);
   aa_stretch_blit(temp, g_btmAlien, 0, 0, temp->w, temp->h, 0, 0, 
		   alien_image_x, alien_image_y);
   destroy_bitmap(temp);

   g_game->window->lock();
   blit(g_btmAlien, g_game->window->surface, 0, 0, 0, 0, 
	alien_image_x, 	alien_image_y);
   g_game->window->unlock();
   return 0;
}

int l_DialogWrite(lua_State* ls)
{
  g_game->window->lock();
  blit(g_btmAlien, screen, 0, 0, 0, 0, alien_image_x, alien_image_y);
    
  if ( !lua_isstring(ls, 1) )
    {
      tw_error("Summon Write without text");
    }
  const char* text = lua_tostring(ls, 1);

  textout(g_game->window->surface, font, text, 10, 10, -1);
  g_game->window->unlock();
  return 0;
}

int l_DialogAnswer(lua_State* ls)
{
  int i;
  int num = lua_gettop(ls); // number of argument
  MENU *pMenuAnswers = new MENU[num+1];
  for( i=0; i<num; i++)
    {
      const char* ctext = lua_tostring(ls, i+1);
      ASSERT(ctext);
      char * text = strdup(ctext);
      pMenuAnswers[i].text   = text;
      pMenuAnswers[i].proc   = NULL;
      pMenuAnswers[i].child  = NULL;
      pMenuAnswers[i].flags  = 0;
      pMenuAnswers[i].dp     = NULL;
    }
  pMenuAnswers[num].text   = NULL;
  pMenuAnswers[num].proc   = NULL;
  pMenuAnswers[num].child  = NULL;
  pMenuAnswers[num].flags  = 0;
  pMenuAnswers[num].dp     = NULL;
  
  int ret = -1;
  while( ret == -1 )
    ret = do_menu(pMenuAnswers, 0, screen->h/2);
  ret++;
  ///////////////////////////////////////////////
  //Free memory
  for(i=0;i<num;i++)
    free(pMenuAnswers[num].text);
  delete[] pMenuAnswers;
  lua_pushnumber(ls, ret);
  return 1;
}

int l_DialogEnd ( lua_State* ls )
{
  // restore pre-dialog image
  g_game->window->lock();
  blit( g_btmOld, g_game->window->surface, 0, 0, 0, 0, g_btmOld->w, g_btmOld->h );
  destroy_bitmap( g_btmOld );
  g_game->window->unlock();
  g_btmOld = NULL;
  
  // destroy alien picture
  //destroy_bitmap( g_btmAlien );
  //g_btmAlien = NULL;
  
//  g_game->unpause();

  return 0;
}

--- NEW FILE: gdialog.h ---
#ifndef __GDIALOG_H__
#define __GDIALOG_H__

extern "C" {
#	include "lua.h"
#	include "lualib.h"
#	include "lauxlib.h"
}

class GobGame;

void InitConversationModule ( lua_State* L, GobGame * game );

int l_DialogStart(lua_State* ls);
int l_DialogSetAlienImage(lua_State* ls);
int l_DialogWrite(lua_State* ls);
int l_DialogAnswer(lua_State* ls);
int l_DialogEnd ( lua_State* ls );

#endif // __G_DIALOG_H__

--- NEW FILE: gquest.cpp ---

#include "games/ggob.h"
#include "gdialog.h"
#include "melee.h"
REGISTER_FILE
#include "melee/mship.h"

static GobPlayer * g_player = NULL;
static GobGame * g_game = NULL;

Quest::Quest( const char * szLuaFile, GobPlayer * player, GobGame * game )
{
  gob_player = player;
  gob_game = game;
  
  bExist = true;

  L = lua_open();
  InitConversationModule( L, game );

  // Register C function
  lua_register(L, "Dialog", l_Dialog);
  lua_register(L, "AddObject", l_AddObject);
  lua_register(L, "RemoveObject", l_RemoveObject);
  // Load Quest
  lua_dofile(L, szLuaFile);
}

Quest::~Quest()
{
  lua_close(L);
}

bool Quest::exist() 
{
  return bExist;
}

void Quest::Process()
{
  g_player = gob_player;
  g_game = gob_game;

  int top = lua_gettop(L);
  lua_pushstring(L, "Process");
  lua_gettable(L, LUA_GLOBALSINDEX);

  if ( !lua_isfunction(L, -1) )
    {
      tw_error("Quest script is not contain Process function");
    };

  // gather information
  int time = gob_game->game_time;
  int enemy = gob_game->gobenemies;
  int kills = gob_player->kills;
  int x = iround(gob_player->ship->normal_pos().x);
  int y = iround(gob_player->ship->normal_pos().y);

  // Pass addition information to lua script 
  lua_pushnumber(L, time);
  lua_pushnumber(L, enemy);
  lua_pushnumber(L, kills);
  lua_pushnumber(L, x);
  lua_pushnumber(L, y);
  lua_pushnumber(L, 0); //reserved
  lua_pushnumber(L, 0); //reserved
  lua_pushstring(L, "test"); //reserved

  lua_call(L, 8, 0);
  
  lua_pushstring(L, "Complited");
  lua_gettable(L, LUA_GLOBALSINDEX);
  if ( lua_isnumber(L, -1) )
    {
      bExist = lua_tonumber(L, -1);
    }
  else
    {
      tw_error("Unable to read Complited variable from lua script");
    }
  lua_settop(L, top);
  return;
}

int Quest::l_Dialog(lua_State* ls)
{
  return 0;
}

int Quest::l_AddObject(lua_State* ls)
{
  g_game->add_new_enemy();
  return 0;
}

int Quest::l_RemoveObject(lua_State* ls)
{
  return 0;
}

--- NEW FILE: gquest.h ---
#ifndef __GQUEST_H__
#define __GQUEST_H__

extern "C" {
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
}

class GobPlayer;
class GobGame;

class Quest
{
  bool bExist;
  lua_State * L;
  GobPlayer * gob_player;
  GobGame * gob_game;
 
 public:
  Quest( const char * szLuaFile, GobPlayer * player, GobGame * game );
  virtual ~Quest();
    /*! \brief Summon default quest handler
      This function summon in every player think()
    */
    void Process();
    bool exist();
    private:
  // This is callback functions from Lua quest script
  /*! \brief On complite quest */
  static int l_Dialog(lua_State* ls);
  /*! \brief Add quest object ( ship, starbase) to the game */
  static int l_AddObject(lua_State* ls);
  /*! \brief Remove quest object ( ship, starbase ... ) */
  static int l_RemoveObject(lua_State*ls);
};


#endif // __GQUEST_H__

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

[<yu...@us...>]

Update of /cvsroot/timewarp/source/melee
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/source/melee

Modified Files:
	manim.cpp mcbodies.cpp mcbodies.h mcontrol.cpp mcontrol.h 
	mfleet.cpp mfleet.h mframe.cpp mgame.cpp mitems.cpp 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:
removed ugly "../" from include directive


Index: manim.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/manim.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** manim.cpp	24 Aug 2003 10:55:33 -0000	1.4
--- manim.cpp	13 Jan 2004 01:15:25 -0000	1.5
***************
*** 1,5 ****
  
! #include "../util/aastr.h"
! #include "../melee.h"
  REGISTER_FILE
  
--- 1,5 ----
  
! #include "util/aastr.h"
! #include "melee.h"
  REGISTER_FILE
  

Index: mcbodies.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mcbodies.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mcbodies.cpp	12 Dec 2003 00:15:43 -0000	1.7
--- mcbodies.cpp	13 Jan 2004 01:15:25 -0000	1.8
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mcbodies.h	10 Jan 2004 22:27:59 -0000	1.5
--- mcbodies.h	13 Jan 2004 01:15:25 -0000	1.6
***************
*** 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.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mcontrol.cpp	22 Dec 2003 10:29:44 -0000	1.13
--- mcontrol.cpp	13 Jan 2004 01:15:25 -0000	1.14
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mcontrol.h	10 Jan 2004 22:27:59 -0000	1.6
--- mcontrol.h	13 Jan 2004 01:15:25 -0000	1.7
***************
*** 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.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** mfleet.cpp	11 Dec 2003 20:47:28 -0000	1.17
--- mfleet.cpp	13 Jan 2004 01:15:25 -0000	1.18
***************
*** 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.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mfleet.h	10 Jan 2004 22:27:59 -0000	1.12
--- mfleet.h	13 Jan 2004 01:15:25 -0000	1.13
***************
*** 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.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** mframe.cpp	22 Dec 2003 12:03:17 -0000	1.20
--- mframe.cpp	13 Jan 2004 01:15:25 -0000	1.21
***************
*** 3,12 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../id.h"
! #include "../frame.h"
! #include "../libs.h"
! #include "../util/aastr.h"
  
  #include "mframe.h"
--- 3,12 ----
  #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.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** mgame.cpp	22 Dec 2003 12:03:17 -0000	1.27
--- mgame.cpp	13 Jan 2004 01:15:25 -0000	1.28
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mitems.cpp	30 Oct 2003 15:25:45 -0000	1.5
--- mitems.cpp	13 Jan 2004 01:15:25 -0000	1.6
***************
*** 1,8 ****
  #include <allegro.h>
! #include "../melee.h"
  REGISTER_FILE
  
  
! #include "../frame.h"
  #include "mframe.h"
  #include "mview.h"
--- 1,8 ----
  #include <allegro.h>
! #include "melee.h"
  REGISTER_FILE
  
  
! #include "frame.h"
  #include "mframe.h"
  #include "mview.h"

Index: mlog.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mlog.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mlog.cpp	25 Nov 2003 00:13:10 -0000	1.5
--- mlog.cpp	13 Jan 2004 01:15:25 -0000	1.6
***************
*** 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.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** mmain.cpp	12 Dec 2003 00:15:43 -0000	1.18
--- mmain.cpp	13 Jan 2004 01:15:25 -0000	1.19
***************
*** 6,12 ****
  #include <allegro.h>
  
! #include "../melee.h"
  REGISTER_FILE
! #include "../scp.h"
  
  
--- 6,12 ----
  #include <allegro.h>
  
! #include "melee.h"
  REGISTER_FILE
! #include "scp.h"
  
  
***************
*** 22,26 ****
  #include "mfleet.h"
  
! #include "../games/gflmelee.h"
  
  
--- 22,26 ----
  #include "mfleet.h"
  
! #include "games/gflmelee.h"
  
  

Index: mmain.h
===================================================================
RCS file: /cvsroot/timewarp/source/melee/mmain.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mmain.h	10 Jan 2004 22:27:59 -0000	1.6
--- mmain.h	13 Jan 2004 01:15:26 -0000	1.7
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mmath.cpp	21 Nov 2003 10:21:23 -0000	1.5
--- mmath.cpp	13 Jan 2004 01:15:26 -0000	1.6
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mnet1.cpp	12 Dec 2003 00:15:43 -0000	1.6
--- mnet1.cpp	13 Jan 2004 01:15:26 -0000	1.7
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mnet1.h	10 Jan 2004 22:27:59 -0000	1.4
--- mnet1.h	13 Jan 2004 01:15:26 -0000	1.5
***************
*** 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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** moptions.cpp	13 Dec 2003 04:07:44 -0000	1.11
--- moptions.cpp	13 Jan 2004 01:15:26 -0000	1.12
***************
*** 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.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** mship.cpp	30 Dec 2003 09:27:35 -0000	1.23
--- mship.cpp	13 Jan 2004 01:15:26 -0000	1.24
***************
*** 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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mshot.cpp	26 Oct 2003 10:43:17 -0000	1.11
--- mshot.cpp	13 Jan 2004 01:15:26 -0000	1.12
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mshpdata.cpp	12 Dec 2003 00:15:43 -0000	1.5
--- mshpdata.cpp	13 Jan 2004 01:15:26 -0000	1.6
***************
*** 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.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mshppan.cpp	24 Nov 2003 22:12:29 -0000	1.15
--- mshppan.cpp	13 Jan 2004 01:15:26 -0000	1.16
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mshppan.h	10 Jan 2004 22:27:59 -0000	1.7
--- mshppan.h	13 Jan 2004 01:15:26 -0000	1.8
***************
*** 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.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** msprite.cpp	12 Dec 2003 00:15:43 -0000	1.12
--- msprite.cpp	13 Jan 2004 01:15:26 -0000	1.13
***************
*** 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.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mview.cpp	22 Dec 2003 12:03:18 -0000	1.12
--- mview.cpp	13 Jan 2004 01:15:26 -0000	1.13
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mview.h	10 Jan 2004 22:27:59 -0000	1.4
--- mview.h	13 Jan 2004 01:15:26 -0000	1.5
***************
*** 2,6 ****
  #define __MVIEW_H__
  
! #include "../melee.h"
  #include "mframe.h"
  
--- 2,6 ----
  #define __MVIEW_H__
  
! #include "melee.h"
  #include "mframe.h"
  

[Timewarp-commit] gamex mapinfo.txt,1.4,1.5

[<yu...@us...>]

Update of /cvsroot/timewarp/gamex
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/gamex

Modified Files:
	mapinfo.txt 
Log Message:
removed ugly "../" from include directive


Index: mapinfo.txt
===================================================================
RCS file: /cvsroot/timewarp/gamex/mapinfo.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mapinfo.txt	10 Jan 2004 14:10:31 -0000	1.4
--- mapinfo.txt	13 Jan 2004 01:15:26 -0000	1.5
***************
*** 1,52 ****
- 1
- 
-               Some region
-  empty_type
-  0.000000 0.000000 1
-  2
- 
- 	 Beta Wensicia
- 	 small
- 	 8.819304 5.500211 2
- 	 4
- 
- 		 noname
- 		 big
- 		 1966.101695 542.372881 3
- 		 3
- 
- 			 noname
- 			 medium
- 			 1473.272490 664.928292 37B74224
- 			 0
- 
- 			 noname
- 			 medium
- 			 717.079531 406.779661 6747AA28
- 			 0
- 
- 			 noname
- 			 medium
- 			 1501.955671 417.209909 515DD970
- 			 0
- 
- 		 noname
- 		 small
- 		 2091.264668 458.930900 4
- 		 0
- 
- 		 noname
- 		 dwarf
- 		 2033.898305 547.588005 5
- 		 0
- 
- 		 noname
- 		 big
- 		 2445.893090 735.332464 6
- 		 0
- 
- 	 Alpha Wensicia
- 	 medium
- 	 2.560443 3.793249 7
- 	 0
- 
--- 0 ----

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

[<yu...@us...>]

Update of /cvsroot/timewarp/source/other
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/source/other

Modified Files:
	gup.cpp nullphas.cpp nullphas.h objanim.cpp objanim.h 
	orbit.cpp orbit.h planet3d.cpp planet3d.h radar.cpp radar.h 
	shippart.cpp shippart.h vbodies.cpp vbodies.h vtarget.cpp 
Log Message:
removed ugly "../" from include directive


Index: gup.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/gup.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gup.cpp	20 Oct 2003 11:00:15 -0000	1.6
--- gup.cpp	13 Jan 2004 01:15:25 -0000	1.7
***************
*** 1,14 ****
  #include <string.h>
  #include <allegro.h>
! #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"
  
--- 1,14 ----
  #include <string.h>
  #include <allegro.h>
! #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"
  

Index: nullphas.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/nullphas.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nullphas.cpp	20 Oct 2003 11:00:15 -0000	1.5
--- nullphas.cpp	13 Jan 2004 01:15:25 -0000	1.6
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** nullphas.h	10 Jan 2004 22:27:59 -0000	1.4
--- nullphas.h	13 Jan 2004 01:15:25 -0000	1.5
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** objanim.cpp	20 Oct 2003 11:00:16 -0000	1.5
--- objanim.cpp	13 Jan 2004 01:15:25 -0000	1.6
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** objanim.h	10 Jan 2004 22:27:59 -0000	1.4
--- objanim.h	13 Jan 2004 01:15:25 -0000	1.5
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** orbit.cpp	20 Oct 2003 11:00:16 -0000	1.6
--- orbit.cpp	13 Jan 2004 01:15:25 -0000	1.7
***************
*** 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: orbit.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/orbit.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** orbit.h	10 Jan 2004 22:27:59 -0000	1.4
--- orbit.h	13 Jan 2004 01:15:25 -0000	1.5
***************
*** 5,20 ****
  //#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"
  
  #define ORBIT_ID 0x26842116
--- 5,20 ----
  //#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"
  
  #define ORBIT_ID 0x26842116

Index: planet3d.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/planet3d.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** planet3d.cpp	4 Jan 2004 22:07:00 -0000	1.14
--- planet3d.cpp	13 Jan 2004 01:15:25 -0000	1.15
***************
*** 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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** planet3d.h	10 Jan 2004 22:27:59 -0000	1.2
--- planet3d.h	13 Jan 2004 01:15:25 -0000	1.3
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** radar.cpp	20 Oct 2003 11:00:19 -0000	1.5
--- radar.cpp	13 Jan 2004 01:15:25 -0000	1.6
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** radar.h	10 Jan 2004 22:27:59 -0000	1.4
--- radar.h	13 Jan 2004 01:15:25 -0000	1.5
***************
*** 5,20 ****
  #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
--- 5,20 ----
  #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

Index: shippart.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/other/shippart.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shippart.cpp	22 Dec 2003 10:29:44 -0000	1.8
--- shippart.cpp	13 Jan 2004 01:15:25 -0000	1.9
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shippart.h	10 Jan 2004 22:27:59 -0000	1.7
--- shippart.h	13 Jan 2004 01:15:25 -0000	1.8
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** vbodies.cpp	10 Jan 2004 22:27:59 -0000	1.9
--- vbodies.cpp	13 Jan 2004 01:15:25 -0000	1.10
***************
*** 5,25 ****
  
  #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"
  
  
--- 5,25 ----
  
  #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"
  
  

Index: vbodies.h
===================================================================
RCS file: /cvsroot/timewarp/source/other/vbodies.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** vbodies.h	10 Jan 2004 22:27:59 -0000	1.4
--- vbodies.h	13 Jan 2004 01:15:25 -0000	1.5
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** vtarget.cpp	20 Oct 2003 14:46:14 -0000	1.5
--- vtarget.cpp	13 Jan 2004 01:15:25 -0000	1.6
***************
*** 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 "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

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

[<yu...@us...>]

Update of /cvsroot/timewarp/source/games
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/source/games

Modified Files:
	dialog.cpp gamehierarchy.cpp gamehierarchy.h gastroid.cpp 
	gdebugonly.cpp gflmelee.cpp 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:
removed ugly "../" from include directive


Index: dialog.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/dialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dialog.cpp	11 Dec 2003 02:03:28 -0000	1.3
--- dialog.cpp	13 Jan 2004 01:15:23 -0000	1.4
***************
*** 9,14 ****
  #include <allegro.h>
  #include "dialog.h"
! #include "../util/aautil.h"
! #include "../util/aastr.h"
  
  BITMAP* Dialog::btmAlien   = NULL;
--- 9,14 ----
  #include <allegro.h>
  #include "dialog.h"
! #include "util/aautil.h"
! #include "util/aastr.h"
  
  BITMAP* Dialog::btmAlien   = NULL;
***************
*** 46,49 ****
--- 46,50 ----
    btmPScreen = NULL;
  }
+ 
  ////////////////////////////////////////////////////////////////////////////
  //Lua function implementation

Index: gamehierarchy.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gamehierarchy.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gamehierarchy.cpp	28 Oct 2003 00:00:39 -0000	1.7
--- gamehierarchy.cpp	13 Jan 2004 01:15:23 -0000	1.8
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gamehierarchy.h	10 Jan 2004 22:27:59 -0000	1.4
--- gamehierarchy.h	13 Jan 2004 01:15:23 -0000	1.5
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gastroid.cpp	20 Oct 2003 11:00:13 -0000	1.6
--- gastroid.cpp	13 Jan 2004 01:15:23 -0000	1.7
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gdebugonly.cpp	10 Jan 2004 22:27:59 -0000	1.6
--- gdebugonly.cpp	13 Jan 2004 01:15:23 -0000	1.7
***************
*** 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.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** gflmelee.cpp	22 Dec 2003 10:29:44 -0000	1.17
--- gflmelee.cpp	13 Jan 2004 01:15:23 -0000	1.18
***************
*** 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"
  
  

Index: ggob.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ggob.cpp	11 Jan 2004 19:36:13 -0000	1.12
--- ggob.cpp	13 Jan 2004 01:15:23 -0000	1.13
***************
*** 6,33 ****
  #include <allegro.h>
  
! #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"
  
  
--- 6,33 ----
  #include <allegro.h>
  
! #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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ggob.h	11 Jan 2004 19:36:13 -0000	1.5
--- ggob.h	13 Jan 2004 01:15:23 -0000	1.6
***************
*** 4,15 ****
  #include <list>
  
! #include "../melee.h"
! #include "../melee/mframe.h"
! #include "../melee/mgame.h"
  
! #include "../melee/mitems.h"
! #include "../melee/mcbodies.h"
  
! #include "gquest.h"
  
  class Upgrade;
--- 4,15 ----
  #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"
  
  class Upgrade;

Index: ghyper.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/ghyper.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ghyper.cpp	25 Oct 2003 14:30:19 -0000	1.7
--- ghyper.cpp	13 Jan 2004 01:15:23 -0000	1.8
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gleague.cpp	25 Oct 2003 14:30:19 -0000	1.7
--- gleague.cpp	13 Jan 2004 01:15:23 -0000	1.8
***************
*** 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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gluagame.cpp	10 Jan 2004 20:26:34 -0000	1.1
--- gluagame.cpp	13 Jan 2004 01:15:23 -0000	1.2
***************
*** 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...
  
  extern "C" {
--- 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...
  
  extern "C" {

Index: gmissions.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/games/gmissions.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** gmissions.cpp	22 Dec 2003 10:29:44 -0000	1.20
--- gmissions.cpp	13 Jan 2004 01:15:23 -0000	1.21
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gmissions_objects.cpp	28 Oct 2003 00:00:40 -0000	1.6
--- gmissions_objects.cpp	13 Jan 2004 01:15:24 -0000	1.7
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gplanets.cpp	26 Oct 2003 10:43:17 -0000	1.9
--- gplanets.cpp	13 Jan 2004 01:15:24 -0000	1.10
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gplexplr.cpp	10 Jan 2004 22:27:59 -0000	1.9
--- gplexplr.cpp	13 Jan 2004 01:15:24 -0000	1.10
***************
*** 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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gplexplr.h	10 Jan 2004 22:27:59 -0000	1.2
--- gplexplr.h	13 Jan 2004 01:15:24 -0000	1.3
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gplhuge.cpp	25 Oct 2003 14:30:19 -0000	1.7
--- gplhuge.cpp	13 Jan 2004 01:15:24 -0000	1.8
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gsamp2.cpp	22 Dec 2003 10:29:44 -0000	1.6
--- gsamp2.cpp	13 Jan 2004 01:15:24 -0000	1.7
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gsample.cpp	22 Dec 2003 10:29:44 -0000	1.7
--- gsample.cpp	13 Jan 2004 01:15:24 -0000	1.8
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gsarena.cpp	22 Dec 2003 10:29:44 -0000	1.8
--- gsarena.cpp	13 Jan 2004 01:15:24 -0000	1.9
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gsolar.cpp	20 Oct 2003 11:00:13 -0000	1.6
--- gsolar.cpp	13 Jan 2004 01:15:24 -0000	1.7
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gtrug.cpp	11 Oct 2003 21:00:59 -0000	1.5
--- gtrug.cpp	13 Jan 2004 01:15:24 -0000	1.6
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gtrug.h	10 Jan 2004 22:27:59 -0000	1.4
--- gtrug.h	13 Jan 2004 01:15:24 -0000	1.5
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** vanguard.cpp	22 Dec 2003 10:29:44 -0000	1.10
--- vanguard.cpp	13 Jan 2004 01:15:24 -0000	1.11
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** vgGenSys.cpp	13 Dec 2003 14:31:09 -0000	1.7
--- vgGenSys.cpp	13 Jan 2004 01:15:24 -0000	1.8
***************
*** 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/twgui gametest2.cpp,1.3,1.4 gametest2.h,1.2,1.3 twbutton.cpp,1.2,1.3 twbuttontypes.cpp,1.4,1.5 twgui.cpp,1.16,1.17 twhelpers.cpp,1.2,1.3 twmenuexamples.cpp,1.2,1.3 twpopup.cpp,1.2,1.3 twwindow.cpp,1.6,1.7 utils.cpp,1.8,1.9

[<yu...@us...>]

Update of /cvsroot/timewarp/source/twgui
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/source/twgui

Modified Files:
	gametest2.cpp gametest2.h twbutton.cpp twbuttontypes.cpp 
	twgui.cpp twhelpers.cpp twmenuexamples.cpp twpopup.cpp 
	twwindow.cpp utils.cpp 
Log Message:
removed ugly "../" from include directive


Index: gametest2.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/gametest2.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gametest2.cpp	9 Jan 2004 22:04:02 -0000	1.3
--- gametest2.cpp	13 Jan 2004 01:15:24 -0000	1.4
***************
*** 8,28 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
! //#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/mshppan.h"  //ship panels...
! #include "../melee/mitems.h"
! //#include "../melee/mfleet.h"   //fleets...
  
! #include "../melee/mcbodies.h"
  
! #include "../scp.h"
! #include "../util/history.h"
  
  #include "gametest2.h"
--- 8,28 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
! //#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/mshppan.h"  //ship panels...
! #include "melee/mitems.h"
! //#include "melee/mfleet.h"   //fleets...
  
! #include "melee/mcbodies.h"
  
! #include "scp.h"
! #include "util/history.h"
  
  #include "gametest2.h"
***************
*** 30,37 ****
  //#include "GamePlanetView.h"
  
! #include "../scp.h"
! #include "../melee/mfleet.h"
  
! #include "../frame.h"
  
  #include "gamebuttonevent.h"
--- 30,37 ----
  //#include "GamePlanetView.h"
  
! #include "scp.h"
! #include "melee/mfleet.h"
  
! #include "frame.h"
  
  #include "gamebuttonevent.h"

Index: gametest2.h
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/gametest2.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gametest2.h	10 Jan 2004 22:27:59 -0000	1.2
--- gametest2.h	13 Jan 2004 01:15:24 -0000	1.3
***************
*** 4,11 ****
  #include "twgui.h"
  
! #include "../melee/mgame.h"
! #include "../melee/mmain.h"
  
! #include "../games/gflmelee.h"
  
  #include "twbutton.h"
--- 4,11 ----
  #include "twgui.h"
  
! #include "melee/mgame.h"
! #include "melee/mmain.h"
  
! #include "games/gflmelee.h"
  
  #include "twbutton.h"

Index: twbutton.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twbutton.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** twbutton.cpp	4 Jan 2004 22:07:00 -0000	1.2
--- twbutton.cpp	13 Jan 2004 01:15:24 -0000	1.3
***************
*** 6,11 ****
  
  
! #include "../melee.h"
! //#include "../../melee/mview.h"
  
  REGISTER_FILE
--- 6,11 ----
  
  
! #include "melee.h"
! //#include "melee/mview.h"
  
  REGISTER_FILE

Index: twbuttontypes.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twbuttontypes.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** twbuttontypes.cpp	4 Jan 2004 22:07:00 -0000	1.4
--- twbuttontypes.cpp	13 Jan 2004 01:15:24 -0000	1.5
***************
*** 4,9 ****
  #include <string.h>
  
! #include "../melee.h"
! #include "../melee/mview.h"
  REGISTER_FILE
  
--- 4,9 ----
  #include <string.h>
  
! #include "melee.h"
! #include "melee/mview.h"
  REGISTER_FILE
  

Index: twgui.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twgui.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** twgui.cpp	10 Jan 2004 22:27:59 -0000	1.16
--- twgui.cpp	13 Jan 2004 01:15:24 -0000	1.17
***************
*** 7,12 ****
  #include <string.h>
  
! #include "../melee.h"
! #include "../melee/mview.h"
  REGISTER_FILE
  
--- 7,12 ----
  #include <string.h>
  
! #include "melee.h"
! #include "melee/mview.h"
  REGISTER_FILE
  

Index: twhelpers.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twhelpers.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** twhelpers.cpp	4 Jan 2004 22:07:00 -0000	1.2
--- twhelpers.cpp	13 Jan 2004 01:15:25 -0000	1.3
***************
*** 6,11 ****
  
  
! #include "../melee.h"
! //#include "../../melee/mview.h"
  
  REGISTER_FILE
--- 6,11 ----
  
  
! #include "melee.h"
! //#include "melee/mview.h"
  
  REGISTER_FILE

Index: twmenuexamples.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twmenuexamples.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** twmenuexamples.cpp	4 Jan 2004 22:07:00 -0000	1.2
--- twmenuexamples.cpp	13 Jan 2004 01:15:25 -0000	1.3
***************
*** 6,11 ****
  
  
! #include "../melee.h"
! //#include "../../melee/mview.h"
  
  REGISTER_FILE
--- 6,11 ----
  
  
! #include "melee.h"
! //#include "melee/mview.h"
  
  REGISTER_FILE

Index: twpopup.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twpopup.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** twpopup.cpp	4 Jan 2004 22:07:00 -0000	1.2
--- twpopup.cpp	13 Jan 2004 01:15:25 -0000	1.3
***************
*** 6,11 ****
  
  
! #include "../melee.h"
! //#include "../../melee/mview.h"
  
  REGISTER_FILE
--- 6,11 ----
  
  
! #include "melee.h"
! //#include "melee/mview.h"
  
  REGISTER_FILE

Index: twwindow.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/twwindow.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** twwindow.cpp	4 Jan 2004 22:07:00 -0000	1.6
--- twwindow.cpp	13 Jan 2004 01:15:25 -0000	1.7
***************
*** 5,10 ****
  
  
! #include "../melee.h"
! //#include "../../melee/mview.h"
  
  REGISTER_FILE
--- 5,10 ----
  
  
! #include "melee.h"
! //#include "melee/mview.h"
  
  REGISTER_FILE

Index: utils.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/twgui/utils.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** utils.cpp	4 Jan 2004 22:07:00 -0000	1.8
--- utils.cpp	13 Jan 2004 01:15:25 -0000	1.9
***************
*** 4,8 ****
  #include <string.h>
  
! #include "../melee.h"
  
  #include "utils.h"
--- 4,8 ----
  #include <string.h>
  
! #include "melee.h"
  
  #include "utils.h"

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

[<yu...@us...>]

Update of /cvsroot/timewarp/source/gamex/edit
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/source/gamex/edit

Modified Files:
	disk_stuff.cpp disk_stuff.h edit_dialogue.cpp edit_dialogue.h 
Log Message:
removed ugly "../" from include directive


Index: disk_stuff.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/edit/disk_stuff.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** disk_stuff.cpp	18 Nov 2003 17:18:50 -0000	1.1.1.1
--- disk_stuff.cpp	13 Jan 2004 01:15:24 -0000	1.2
***************
*** 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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** disk_stuff.h	10 Jan 2004 22:27:59 -0000	1.2
--- disk_stuff.h	13 Jan 2004 01:15:24 -0000	1.3
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** edit_dialogue.cpp	4 Jan 2004 22:07:00 -0000	1.5
--- edit_dialogue.cpp	13 Jan 2004 01:15:24 -0000	1.6
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** edit_dialogue.h	10 Jan 2004 22:27:59 -0000	1.5
--- edit_dialogue.h	13 Jan 2004 01:15:24 -0000	1.6
***************
*** 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 ai_fleet.cpp,1.2,1.3 ai_fleet.h,1.3,1.4 ai_race.cpp,1.1.1.1,1.2 gamedata.cpp,1.8,1.9 gamedata.h,1.9,1.10 gamedata_map.cpp,1.1,1.2 gamedata_map.h,1.1,1.2 gamedialogue.cpp,1.5,1.6 gamedialogue.h,1.5,1.6 gamegeneral.cpp,1.9,1.10 gamegeneral.h,1.6,1.7 gamehyper.cpp,1.6,1.7 gamemelee.cpp,1.7,1.8 gamemelee.h,1.5,1.6 gameplanetmission.cpp,1.2,1.3 gameplanetmission.h,1.2,1.3 gameplanetscan.cpp,1.5,1.6 gameplanetscan.h,1.4,1.5 gameplanetview.cpp,1.11,1.12 gameplanetview.h,1.8,1.9 gameproject.cpp,1.9,1.10 gameproject.h,1.9,1.10 gamesolarview.cpp,1.8,1.9 gamesolarview.h,1.7,1.8 gamestarmap.cpp,1.9,1.10 gamestarmap.h,1.8,1.9 projectx.cpp,1.11,1.12

[<yu...@us...>]

Update of /cvsroot/timewarp/source/gamex
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/source/gamex

Modified Files:
	ai_fleet.cpp ai_fleet.h ai_race.cpp gamedata.cpp gamedata.h 
	gamedata_map.cpp gamedata_map.h gamedialogue.cpp 
	gamedialogue.h gamegeneral.cpp gamegeneral.h gamehyper.cpp 
	gamemelee.cpp gamemelee.h gameplanetmission.cpp 
	gameplanetmission.h gameplanetscan.cpp gameplanetscan.h 
	gameplanetview.cpp gameplanetview.h gameproject.cpp 
	gameproject.h gamesolarview.cpp gamesolarview.h 
	gamestarmap.cpp gamestarmap.h projectx.cpp 
Log Message:
removed ugly "../" from include directive


Index: ai_fleet.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/ai_fleet.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ai_fleet.cpp	22 Dec 2003 12:03:17 -0000	1.2
--- ai_fleet.cpp	13 Jan 2004 01:15:22 -0000	1.3
***************
*** 3,7 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
--- 3,7 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  

Index: ai_fleet.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/ai_fleet.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ai_fleet.h	10 Jan 2004 22:27:58 -0000	1.3
--- ai_fleet.h	13 Jan 2004 01:15:22 -0000	1.4
***************
*** 3,7 ****
  
  
! #include "../ais.h"
  
  
--- 3,7 ----
  
  
! #include "ais.h"
  
  

Index: ai_race.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/ai_race.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ai_race.cpp	18 Nov 2003 17:18:47 -0000	1.1.1.1
--- ai_race.cpp	13 Jan 2004 01:15:22 -0000	1.2
***************
*** 3,7 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
--- 3,7 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  

Index: gamedata.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamedata.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gamedata.cpp	10 Jan 2004 14:11:53 -0000	1.8
--- gamedata.cpp	13 Jan 2004 01:15:22 -0000	1.9
***************
*** 3,11 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
! #include "../frame.h"
! #include "../melee/mview.h"
  
  
--- 3,11 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
! #include "frame.h"
! #include "melee/mview.h"
  
  

Index: gamedata.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamedata.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gamedata.h	10 Jan 2004 22:27:58 -0000	1.9
--- gamedata.h	13 Jan 2004 01:15:22 -0000	1.10
***************
*** 2,6 ****
  #define __GAMEX_DATA__
  
! #include "../melee/mframe.h"
  
  #include <stdio.h>
--- 2,6 ----
  #define __GAMEX_DATA__
  
! #include "melee/mframe.h"
  
  #include <stdio.h>

Index: gamedata_map.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamedata_map.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gamedata_map.cpp	10 Jan 2004 14:11:53 -0000	1.1
--- gamedata_map.cpp	13 Jan 2004 01:15:22 -0000	1.2
***************
*** 4,12 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
! #include "../frame.h"
! #include "../melee/mview.h"
  
  
--- 4,12 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
! #include "frame.h"
! #include "melee/mview.h"
  
  

Index: gamedata_map.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamedata_map.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gamedata_map.h	10 Jan 2004 14:11:53 -0000	1.1
--- gamedata_map.h	13 Jan 2004 01:15:22 -0000	1.2
***************
*** 2,6 ****
  #define __GAMEX_DATA_MAP__
  
! #include "../melee/mframe.h"
  
  #include <stdio.h>
--- 2,6 ----
  #define __GAMEX_DATA_MAP__
  
! #include "melee/mframe.h"
  
  #include <stdio.h>

Index: gamedialogue.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamedialogue.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gamedialogue.cpp	4 Jan 2004 22:06:59 -0000	1.5
--- gamedialogue.cpp	13 Jan 2004 01:15:22 -0000	1.6
***************
*** 5,9 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
--- 5,9 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  

Index: gamedialogue.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamedialogue.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gamedialogue.h	10 Jan 2004 22:27:58 -0000	1.5
--- gamedialogue.h	13 Jan 2004 01:15:22 -0000	1.6
***************
*** 9,13 ****
  #include "edit/disk_stuff.h"
  
! #include "../twgui/twgui.h"
  
  
--- 9,13 ----
  #include "edit/disk_stuff.h"
  
! #include "twgui/twgui.h"
  
  

Index: gamegeneral.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamegeneral.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gamegeneral.cpp	11 Jan 2004 19:36:13 -0000	1.9
--- gamegeneral.cpp	13 Jan 2004 01:15:22 -0000	1.10
***************
*** 3,11 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
! #include "../melee/mview.h"
! #include "../frame.h"
  
  #include "gamegeneral.h"
--- 3,11 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
! #include "melee/mview.h"
! #include "frame.h"
  
  #include "gamegeneral.h"

Index: gamegeneral.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamegeneral.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gamegeneral.h	11 Jan 2004 19:36:13 -0000	1.6
--- gamegeneral.h	13 Jan 2004 01:15:22 -0000	1.7
***************
*** 2,6 ****
  #define __GAMEX_GENERAL__
  
! #include "../melee.h"
  
  Vector2 uncorner ( Vector2 pos );
--- 2,6 ----
  #define __GAMEX_GENERAL__
  
! #include "melee.h"
  
  Vector2 uncorner ( Vector2 pos );

Index: gamehyper.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamehyper.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gamehyper.cpp	10 Jan 2004 14:11:53 -0000	1.6
--- gamehyper.cpp	13 Jan 2004 01:15:22 -0000	1.7
***************
*** 3,18 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
! #include "../melee/mlog.h"
! #include "../melee/mcontrol.h"
! #include "../melee/mframe.h"
! #include "../melee/mview.h"
! #include "../melee/mitems.h"
! #include "../melee/manim.h"
  
! #include "../scp.h"
! #include "../util/history.h"
  
  
--- 3,18 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
! #include "melee/mlog.h"
! #include "melee/mcontrol.h"
! #include "melee/mframe.h"
! #include "melee/mview.h"
! #include "melee/mitems.h"
! #include "melee/manim.h"
  
! #include "scp.h"
! #include "util/history.h"
  
  

Index: gamemelee.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamemelee.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gamemelee.cpp	4 Jan 2004 22:07:00 -0000	1.7
--- gamemelee.cpp	13 Jan 2004 01:15:22 -0000	1.8
***************
*** 12,23 ****
  REGISTER_FILE
  
! #include "../melee/mlog.h"
! #include "../melee/mcontrol.h"
! #include "../melee/mframe.h"
! #include "../melee/mview.h"
! #include "../melee/mitems.h"
  
! #include "../scp.h"
! #include "../util/history.h"
  
  
--- 12,23 ----
  REGISTER_FILE
  
! #include "melee/mlog.h"
! #include "melee/mcontrol.h"
! #include "melee/mframe.h"
! #include "melee/mview.h"
! #include "melee/mitems.h"
  
! #include "scp.h"
! #include "util/history.h"
  
  
***************
*** 29,40 ****
  #include <string>
  
! #include "../sc2ships.h"
  
! #include "../melee/mcbodies.h"
  
  
  
! #include "../melee.h"
! #include "../melee/mframe.h"
  
  #include "ai_fleet.h"
--- 29,40 ----
  #include <string>
  
! #include "sc2ships.h"
  
! #include "melee/mcbodies.h"
  
  
  
! #include "melee.h"
! #include "melee/mframe.h"
  
  #include "ai_fleet.h"

Index: gamemelee.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamemelee.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gamemelee.h	4 Jan 2004 22:07:00 -0000	1.5
--- gamemelee.h	13 Jan 2004 01:15:22 -0000	1.6
***************
*** 7,11 ****
  #include "gamegeneral.h"
  
! #include "../melee/mgame.h"
  
  
--- 7,11 ----
  #include "gamegeneral.h"
  
! #include "melee/mgame.h"
  
  

Index: gameplanetmission.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameplanetmission.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gameplanetmission.cpp	25 Nov 2003 00:13:08 -0000	1.2
--- gameplanetmission.cpp	13 Jan 2004 01:15:22 -0000	1.3
***************
*** 5,19 ****
  #include <string.h>
  
! #include "../../melee.h"
  REGISTER_FILE
  
! #include "../../melee/mlog.h"
! #include "../../melee/mcontrol.h"
! #include "../../melee/mframe.h"
! #include "../../melee/mview.h"
! #include "../../melee/mitems.h"
  
! #include "../../scp.h"
! #include "../../util/history.h"
  
  
--- 5,19 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
! #include "melee/mlog.h"
! #include "melee/mcontrol.h"
! #include "melee/mframe.h"
! #include "melee/mview.h"
! #include "melee/mitems.h"
  
! #include "scp.h"
! #include "util/history.h"
  
  

Index: gameplanetmission.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameplanetmission.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gameplanetmission.h	10 Jan 2004 22:27:58 -0000	1.2
--- gameplanetmission.h	13 Jan 2004 01:15:22 -0000	1.3
***************
*** 4,8 ****
  #define __GAME_PLANET_VIEW__
  
! //#include "../twgui/subgame.h"
  
  
--- 4,8 ----
  #define __GAME_PLANET_VIEW__
  
! //#include "twgui/subgame.h"
  
  

Index: gameplanetscan.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameplanetscan.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gameplanetscan.cpp	10 Jan 2004 14:11:53 -0000	1.5
--- gameplanetscan.cpp	13 Jan 2004 01:15:22 -0000	1.6
***************
*** 3,17 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
! #include "../melee/mlog.h"
! #include "../melee/mcontrol.h"
! #include "../melee/mframe.h"
! #include "../melee/mview.h"
! #include "../melee/mitems.h"
  
! #include "../scp.h"
! #include "../util/history.h"
  
  
--- 3,17 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
! #include "melee/mlog.h"
! #include "melee/mcontrol.h"
! #include "melee/mframe.h"
! #include "melee/mview.h"
! #include "melee/mitems.h"
  
! #include "scp.h"
! #include "util/history.h"
  
  
***************
*** 22,26 ****
  #include "stuff/space_body.h"
  
! #include "../melee/mshot.h"
  
  
--- 22,26 ----
  #include "stuff/space_body.h"
  
! #include "melee/mshot.h"
  
  

Index: gameplanetscan.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameplanetscan.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gameplanetscan.h	10 Jan 2004 22:27:58 -0000	1.4
--- gameplanetscan.h	13 Jan 2004 01:15:22 -0000	1.5
***************
*** 8,12 ****
  
  
! #include "../other/planet3d.h"
  
  
--- 8,12 ----
  
  
! #include "other/planet3d.h"
  
  

Index: gameplanetview.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameplanetview.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gameplanetview.cpp	10 Jan 2004 14:11:53 -0000	1.11
--- gameplanetview.cpp	13 Jan 2004 01:15:22 -0000	1.12
***************
*** 3,17 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
! #include "../melee/mlog.h"
! #include "../melee/mcontrol.h"
! #include "../melee/mframe.h"
! #include "../melee/mview.h"
! #include "../melee/mitems.h"
  
! #include "../scp.h"
! #include "../util/history.h"
  
  
--- 3,17 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
! #include "melee/mlog.h"
! #include "melee/mcontrol.h"
! #include "melee/mframe.h"
! #include "melee/mview.h"
! #include "melee/mitems.h"
  
! #include "scp.h"
! #include "util/history.h"
  
  
***************
*** 27,32 ****
  #include "stuff/backgr_stars.h"
  
! #include "../twgui/twgui.h"
! #include "../twgui/twpopup.h"
  
  #include "general/sprites.h"
--- 27,32 ----
  #include "stuff/backgr_stars.h"
  
! #include "twgui/twgui.h"
! #include "twgui/twpopup.h"
  
  #include "general/sprites.h"

Index: gameplanetview.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameplanetview.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gameplanetview.h	10 Jan 2004 22:27:58 -0000	1.8
--- gameplanetview.h	13 Jan 2004 01:15:22 -0000	1.9
***************
*** 7,12 ****
  #include "gamegeneral.h"
  
! #include "../twgui/twwindow.h"
! #include "../twgui/twbuttontypes.h"
  
  
--- 7,12 ----
  #include "gamegeneral.h"
  
! #include "twgui/twwindow.h"
! #include "twgui/twbuttontypes.h"
  
  

Index: gameproject.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameproject.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gameproject.cpp	4 Jan 2004 22:07:00 -0000	1.9
--- gameproject.cpp	13 Jan 2004 01:15:22 -0000	1.10
***************
*** 3,7 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
--- 3,7 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  

Index: gameproject.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gameproject.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gameproject.h	10 Jan 2004 22:27:58 -0000	1.9
--- gameproject.h	13 Jan 2004 01:15:22 -0000	1.10
***************
*** 2,16 ****
  #define __GAME_PROJECT__
  
! #include "../melee/mframe.h"
! #include "../melee/mview.h"
! #include "../frame.h"
! #include "../util/history.h"
  
! #include "../twgui/twwindow.h"
! #include "../twgui/twbuttontypes.h"
  
  #include "gamegeneral.h"
  
! #include "../melee/mtarget.h"
  
  extern BITMAP *game_screen;
--- 2,16 ----
  #define __GAME_PROJECT__
  
! #include "melee/mframe.h"
! #include "melee/mview.h"
! #include "frame.h"
! #include "util/history.h"
  
! #include "twgui/twwindow.h"
! #include "twgui/twbuttontypes.h"
  
  #include "gamegeneral.h"
  
! #include "melee/mtarget.h"
  
  extern BITMAP *game_screen;

Index: gamesolarview.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamesolarview.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gamesolarview.cpp	10 Jan 2004 14:11:53 -0000	1.8
--- gamesolarview.cpp	13 Jan 2004 01:15:23 -0000	1.9
***************
*** 5,15 ****
  //#include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
  
! //#include "../melee/mframe.h"
! //#include "../melee/mview.h"
! //#include "../melee/mitems.h"
  
  #include "gamesolarview.h"
--- 5,15 ----
  //#include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
  
! //#include "melee/mframe.h"
! //#include "melee/mview.h"
! //#include "melee/mitems.h"
  
  #include "gamesolarview.h"
***************
*** 19,24 ****
  #include "stuff/backgr_stars.h"
  
! #include "../twgui/twgui.h"
! #include "../twgui/twmenuexamples.h"
  
  #include "general/sprites.h"
--- 19,24 ----
  #include "stuff/backgr_stars.h"
  
! #include "twgui/twgui.h"
! #include "twgui/twmenuexamples.h"
  
  #include "general/sprites.h"

Index: gamesolarview.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamesolarview.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gamesolarview.h	10 Jan 2004 22:27:58 -0000	1.7
--- gamesolarview.h	13 Jan 2004 01:15:23 -0000	1.8
***************
*** 7,13 ****
  #include "gamegeneral.h"
  
! #include "../twgui/twbuttontypes.h"
! #include "../twgui/twpopup.h"
! #include "../twgui/twmenuexamples.h"
  
  #include "stuff/space_body.h"
--- 7,13 ----
  #include "gamegeneral.h"
  
! #include "twgui/twbuttontypes.h"
! #include "twgui/twpopup.h"
! #include "twgui/twmenuexamples.h"
  
  #include "stuff/space_body.h"

Index: gamestarmap.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamestarmap.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gamestarmap.cpp	10 Jan 2004 14:11:53 -0000	1.9
--- gamestarmap.cpp	13 Jan 2004 01:15:23 -0000	1.10
***************
*** 3,17 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
! #include "../melee/mlog.h"
! #include "../melee/mcontrol.h"
! #include "../melee/mframe.h"
! #include "../melee/mview.h"
! #include "../melee/mitems.h"
  
! #include "../scp.h"
! #include "../util/history.h"
  
  #include "gamedata.h"
--- 3,17 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  
! #include "melee/mlog.h"
! #include "melee/mcontrol.h"
! #include "melee/mframe.h"
! #include "melee/mview.h"
! #include "melee/mitems.h"
  
! #include "scp.h"
! #include "util/history.h"
  
  #include "gamedata.h"

Index: gamestarmap.h
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/gamestarmap.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gamestarmap.h	10 Jan 2004 22:27:58 -0000	1.8
--- gamestarmap.h	13 Jan 2004 01:15:23 -0000	1.9
***************
*** 10,15 ****
  #include "gamesolarview.h"
  
! #include "../twgui/twbuttontypes.h"
! #include "../twgui/twpopup.h"
  
  #include "stuff/space_body.h"
--- 10,15 ----
  #include "gamesolarview.h"
  
! #include "twgui/twbuttontypes.h"
! #include "twgui/twpopup.h"
  
  #include "stuff/space_body.h"

Index: projectx.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/projectx.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** projectx.cpp	10 Jan 2004 14:11:53 -0000	1.11
--- projectx.cpp	13 Jan 2004 01:15:23 -0000	1.12
***************
*** 3,7 ****
  #include <string.h>
  
! #include "../melee.h"
  REGISTER_FILE
  
--- 3,7 ----
  #include <string.h>
  
! #include "melee.h"
  REGISTER_FILE
  

[Timewarp-commit] client.ini,1.25,1.26 makefile,1.7,1.8 TestQuest.lua,1.1,1.2

[<yu...@us...>]

Update of /cvsroot/timewarp
In directory sc8-pr-cvs1:/tmp/cvs-serv10225

Modified Files:
	client.ini makefile TestQuest.lua 
Log Message:
removed ugly "../" from include directive


Index: makefile
===================================================================
RCS file: /cvsroot/timewarp/makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile	9 Jan 2004 22:04:02 -0000	1.7
--- makefile	13 Jan 2004 01:15:23 -0000	1.8
***************
*** 16,20 ****
  CC = g++
  LD = g++
! CFLAGS = -fsigned-char -Wall
  OBJDIR = obj
  NAME = timewarp
--- 16,20 ----
  CC = g++
  LD = g++
! CFLAGS = -fsigned-char -Wall 
  OBJDIR = obj
  NAME = timewarp
***************
*** 60,63 ****
--- 60,67 ----
  endif
  
+ CFLAGS += -I./source -I./source/gamex
+ 
+ #CFLAGS += ${addprefix -I./, $(VPATH)}
+ 
  LIBS += -llualib -llua
   

Index: TestQuest.lua
===================================================================
RCS file: /cvsroot/timewarp/TestQuest.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestQuest.lua	11 Jan 2004 19:36:14 -0000	1.1
--- TestQuest.lua	13 Jan 2004 01:15:23 -0000	1.2
***************
*** 8,9 ****
--- 8,14 ----
  end
  
+ DialogStart "pkunk-standing.bmp"
+ --DialogWrite "Hello, I have no quest for you yet"
+ DialogAnswer ("OK", "NOOOOOOOO")
+ DialogEnd()
+ 

[Timewarp-commit] source/ais c_input.cpp,1.6,1.7 c_other.cpp,1.6,1.7 c_wussie.cpp,1.9,1.10

[<yu...@us...>]

Update of /cvsroot/timewarp/source/ais
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/source/ais

Modified Files:
	c_input.cpp c_other.cpp c_wussie.cpp 
Log Message:
removed ugly "../" from include directive


Index: c_input.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/ais/c_input.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** c_input.cpp	10 Jan 2004 22:27:58 -0000	1.6
--- c_input.cpp	13 Jan 2004 01:15:23 -0000	1.7
***************
*** 17,24 ****
  #include <string.h>
  #include <allegro.h>
! #include "../melee.h"
  REGISTER_FILE
! #include "../ais.h"
! #include "../melee/mship.h"
  
  
--- 17,24 ----
  #include <string.h>
  #include <allegro.h>
! #include "melee.h"
  REGISTER_FILE
! #include "ais.h"
! #include "melee/mship.h"
  
  

Index: c_other.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/ais/c_other.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** c_other.cpp	10 Jan 2004 22:27:58 -0000	1.6
--- c_other.cpp	13 Jan 2004 01:15:23 -0000	1.7
***************
*** 1,3 ****
! #include "../ais.h"
  REGISTER_FILE
  
--- 1,3 ----
! #include "ais.h"
  REGISTER_FILE
  

Index: c_wussie.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/ais/c_wussie.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** c_wussie.cpp	10 Jan 2004 22:27:58 -0000	1.9
--- c_wussie.cpp	13 Jan 2004 01:15:23 -0000	1.10
***************
*** 3,12 ****
  #include <allegro.h>
  
! #include "../melee.h"
! #include "../ais.h"
! #include "../melee/mcontrol.h"
! #include "../melee/mframe.h"
! #include "../melee/mship.h"
! #include "../melee/mmain.h"
  
  #define OPTION_UNKNOWN 0
--- 3,12 ----
  #include <allegro.h>
  
! #include "melee.h"
! #include "ais.h"
! #include "melee/mcontrol.h"
! #include "melee/mframe.h"
! #include "melee/mship.h"
! #include "melee/mmain.h"
  
  #define OPTION_UNKNOWN 0

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

[<yu...@us...>]

Update of /cvsroot/timewarp/source/gamex/stuff
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/source/gamex/stuff

Modified Files:
	backgr_stars.cpp space_body.cpp space_body.h 
Log Message:
removed ugly "../" from include directive


Index: backgr_stars.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/stuff/backgr_stars.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** backgr_stars.cpp	13 Dec 2003 14:33:10 -0000	1.2
--- backgr_stars.cpp	13 Jan 2004 01:15:23 -0000	1.3
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** space_body.cpp	10 Jan 2004 14:11:53 -0000	1.6
--- space_body.cpp	13 Jan 2004 01:15:23 -0000	1.7
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** space_body.h	10 Jan 2004 22:27:58 -0000	1.6
--- space_body.h	13 Jan 2004 01:15:23 -0000	1.7
***************
*** 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/newships shpaktgu.cpp,1.1,1.2 shpalabc.cpp,1.12,1.13 shpalckr.cpp,1.9,1.10 shpalhdr.cpp,1.9,1.10 shparitr.cpp,1.10,1.11 shparkpi.cpp,1.9,1.10 shpartem.cpp,1.8,1.9 shpayrbs.cpp,1.16,1.17 shpbahbu.cpp,1.1,1.2 shpbatde.cpp,1.14,1.15 shpbipka.cpp,1.10,1.11 shpbogce.cpp,1.1,1.2 shpbubbo.cpp,1.14,1.15 shpbubex.cpp,1.7,1.8 shpchoex.cpp,1.8,1.9 shpclofl.cpp,1.9,1.10 shpconca.cpp,1.11,1.12 shpconho.cpp,1.8,1.9 shpcrapl.cpp,1.5,1.6 shpcresu.cpp,1.7,1.8 shpdajem.cpp,1.8,1.9 shpdeees.cpp,1.1,1.2 shpdjila.cpp,1.6,1.7 shpdragr.cpp,1.5,1.6 shpducla.cpp,1.11,1.12 shpdyzha.cpp,1.9,1.10 shpearc2.cpp,1.5,1.6 shpearc3.cpp,1.11,1.12 shpestgu.cpp,1.10,1.11 shpfiear.cpp,1.7,1.8 shpfopsl.cpp,1.5,1.6 shpforsh.cpp,1.7,1.8 shpfresc.cpp,1.6,1.7 shpgahmo.cpp,1.3,1.4 shpgarty.cpp,1.8,1.9 shpgerhe.cpp,1.14,1.15 shpglacr.cpp,1.6,1.7 shpglads.cpp,1.5,1.6 shphotsp.cpp,1.9,1.10 shphubde.cpp,1.4,1.5 shphydcr.cpp,1.7,1.8 shpiceco.cpp,1.8,1.9 shpilwsp.cpp,1.8,1.9 shpimpka.cpp,1.9,1.10 shpjnkla.cpp,1.10,1.11 shpjurcu.cpp,1.1,1.2 shpjygst.cpp,1.10,1.11 shpkabwe.cpp,1.10,1.11 shpkahbo.cpp,1.8,1.9 shpkatas.cpp,1.8,1.9 shpkatpo.cpp,1.14,1.15 shpklidr.cpp,1.5,1.6 shpkoaja.cpp,1.3,1.4 shpkoapa.cpp,1.5,1.6 shpkolfl.cpp,1.8,1.9 shpktesa.cpp,1.5,1.6 shpleimu.cpp,1.6,1.7 shplyrwa.cpp,1.9,1.10 shpmekpi.cpp,1.10,1.11 shpmoisp.cpp,1.7,1.8 shpmontr.cpp,1.6,1.7 shpnarlu.cpp,1.10,1.11 shpneccr.cpp,1.9,1.10 shpneodr.cpp,1.7,1.8 shpnisha.cpp,1.5,1.6 shpoliha.cpp,1.7,1.8 shpostdi.cpp,1.7,1.8 shppanav.cpp,1.6,1.7 shpphepa.cpp,1.12,1.13 shpplala.cpp,1.1,1.2 shpplane.cpp,1.8,1.9 shpqlore.cpp,1.7,1.8 shpquasi.cpp,1.10,1.11 shpquawr.cpp,1.10,1.11 shpraame.cpp,1.11,1.12 shpradfi.cpp,1.4,1.5 shprekas.cpp,1.6,1.7 shprogsq.cpp,1.12,1.13 shpsamat.cpp,1.13,1.14 shpsclfr.cpp,1.6,1.7 shpsefna.cpp,1.10,1.11 shpstaba.cpp,1.5,1.6 shpstrsc.cpp,1.7,1.8 shptauar.cpp,1.11,1.12 shptaubo.cpp,1.8,1.9 shptauda.cpp,1.7,1.8 shptauem.cpp,1.8,1.9 shptaufi.cpp,1.1,1.2 shptaugl.cpp,1.6,1.7 shptauhu.cpp,1.7,1.8 shptaule.cpp,1.10,1.11 shptaumc.cpp,1.5,1.6 shptaume.cpp,1.9,1.10 shptausl.cpp,1.1,1.2 shptaust.cpp,1.5,1.6 shptauto.cpp,1.1,1.2 shptautu.cpp,1.5,1.6 shptelno.cpp,1.6,1.7 shpterbi.cpp,1.1,1.2 shptougr.cpp,1.5,1.6 shptrige.cpp,1.5,1.6 shptulra.cpp,1.10,1.11 shpulzin.cpp,1.5,1.6 shpuosli.cpp,1.7,1.8 shpuxjba.cpp,1.4,1.5 shpvelcr.cpp,1.5,1.6 shpvenke.cpp,1.8,1.9 shpvezba.cpp,1.8,1.9 shpvioge.cpp,1.4,1.5 shpvirli.cpp,1.5,1.6 shpvuvji.cpp,1.1,1.2 shpwassu.cpp,1.12,1.13 shpwistr.cpp,1.7,1.8 shpwolmi.cpp,1.1,1.2 shpxaaar.cpp,1.7,1.8 shpxilcr.cpp,1.10,1.11 shpxxxas.cpp,1.8,1.9 shpxxxma.cpp,1.9,1.10 shpyevme.cpp,1.12,1.13 shpyurpa.cpp,1.11,1.12 shpyusra.cpp,1.10,1.11 shpzeksh.cpp,1.5,1.6

[<yu...@us...>]

Update of /cvsroot/timewarp/source/newships
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/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:
removed ugly "../" from include directive


Index: shpaktgu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpaktgu.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shpaktgu.cpp	8 Jan 2004 22:22:45 -0000	1.1
--- shpaktgu.cpp	13 Jan 2004 01:15:26 -0000	1.2
***************
*** 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.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shpalabc.cpp	2 Nov 2003 12:11:53 -0000	1.12
--- shpalabc.cpp	13 Jan 2004 01:15:26 -0000	1.13
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpalckr.cpp	25 Oct 2003 14:30:20 -0000	1.9
--- shpalckr.cpp	13 Jan 2004 01:15:26 -0000	1.10
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpalhdr.cpp	9 Nov 2003 11:26:52 -0000	1.9
--- shpalhdr.cpp	13 Jan 2004 01:15:26 -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: shparitr.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shparitr.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shparitr.cpp	20 Oct 2003 11:00:23 -0000	1.10
--- shparitr.cpp	13 Jan 2004 01:15:26 -0000	1.11
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shparkpi.cpp	25 Oct 2003 14:30:20 -0000	1.9
--- shparkpi.cpp	13 Jan 2004 01:15:26 -0000	1.10
***************
*** 1,7 ****
! #include "../ship.h"
! #include "../melee/mview.h"
  REGISTER_FILE
  
! //#include "../sc1ships.h"
  class ArkanoidPincerShip;
  
--- 1,7 ----
! #include "ship.h"
! #include "melee/mview.h"
  REGISTER_FILE
  
! //#include "sc1ships.h"
  class ArkanoidPincerShip;
  

Index: shpartem.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpartem.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpartem.cpp	21 Nov 2003 10:24:43 -0000	1.8
--- shpartem.cpp	13 Jan 2004 01:15:26 -0000	1.9
***************
*** 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.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** shpayrbs.cpp	22 Dec 2003 10:29:44 -0000	1.16
--- shpayrbs.cpp	13 Jan 2004 01:15:26 -0000	1.17
***************
*** 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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shpbahbu.cpp	8 Jan 2004 22:22:45 -0000	1.1
--- shpbahbu.cpp	13 Jan 2004 01:15:26 -0000	1.2
***************
*** 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.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** shpbatde.cpp	8 Nov 2003 11:19:30 -0000	1.14
--- shpbatde.cpp	13 Jan 2004 01:15:26 -0000	1.15
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpbipka.cpp	22 Dec 2003 10:29:44 -0000	1.10
--- shpbipka.cpp	13 Jan 2004 01:15:26 -0000	1.11
***************
*** 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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shpbogce.cpp	8 Jan 2004 22:22:45 -0000	1.1
--- shpbogce.cpp	13 Jan 2004 01:15:26 -0000	1.2
***************
*** 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.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** shpbubbo.cpp	19 Nov 2003 00:15:03 -0000	1.14
--- shpbubbo.cpp	13 Jan 2004 01:15:26 -0000	1.15
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpbubex.cpp	19 Nov 2003 00:15:24 -0000	1.7
--- shpbubex.cpp	13 Jan 2004 01:15:27 -0000	1.8
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpchoex.cpp	30 Oct 2003 19:30:33 -0000	1.8
--- shpchoex.cpp	13 Jan 2004 01:15:27 -0000	1.9
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpclofl.cpp	15 Nov 2003 20:48:07 -0000	1.9
--- shpclofl.cpp	13 Jan 2004 01:15:27 -0000	1.10
***************
*** 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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpconca.cpp	19 Nov 2003 00:25:34 -0000	1.11
--- shpconca.cpp	13 Jan 2004 01:15:27 -0000	1.12
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpconho.cpp	15 Nov 2003 20:48:07 -0000	1.8
--- shpconho.cpp	13 Jan 2004 01:15:27 -0000	1.9
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpcrapl.cpp	20 Oct 2003 11:00:31 -0000	1.5
--- shpcrapl.cpp	13 Jan 2004 01:15:27 -0000	1.6
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpcresu.cpp	20 Oct 2003 11:00:32 -0000	1.7
--- shpcresu.cpp	13 Jan 2004 01:15:27 -0000	1.8
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpdajem.cpp	26 Oct 2003 10:43:17 -0000	1.8
--- shpdajem.cpp	13 Jan 2004 01:15:27 -0000	1.9
***************
*** 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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shpdeees.cpp	8 Jan 2004 22:22:45 -0000	1.1
--- shpdeees.cpp	13 Jan 2004 01:15:27 -0000	1.2
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpdjila.cpp	25 Oct 2003 14:30:20 -0000	1.6
--- shpdjila.cpp	13 Jan 2004 01:15:27 -0000	1.7
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpdragr.cpp	20 Oct 2003 11:00:33 -0000	1.5
--- shpdragr.cpp	13 Jan 2004 01:15:27 -0000	1.6
***************
*** 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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpducla.cpp	23 Oct 2003 20:38:34 -0000	1.11
--- shpducla.cpp	13 Jan 2004 01:15:27 -0000	1.12
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpdyzha.cpp	26 Oct 2003 10:43:17 -0000	1.9
--- shpdyzha.cpp	13 Jan 2004 01:15:27 -0000	1.10
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpearc2.cpp	20 Oct 2003 11:00:34 -0000	1.5
--- shpearc2.cpp	13 Jan 2004 01:15:27 -0000	1.6
***************
*** 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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpearc3.cpp	22 Dec 2003 10:29:44 -0000	1.11
--- shpearc3.cpp	13 Jan 2004 01:15:27 -0000	1.12
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpestgu.cpp	22 Nov 2003 18:29:09 -0000	1.10
--- shpestgu.cpp	13 Jan 2004 01:15:27 -0000	1.11
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpfiear.cpp	23 Oct 2003 20:38:34 -0000	1.7
--- shpfiear.cpp	13 Jan 2004 01:15:27 -0000	1.8
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpfopsl.cpp	20 Oct 2003 11:00:35 -0000	1.5
--- shpfopsl.cpp	13 Jan 2004 01:15:27 -0000	1.6
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpforsh.cpp	22 Oct 2003 22:35:21 -0000	1.7
--- shpforsh.cpp	13 Jan 2004 01:15:27 -0000	1.8
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpfresc.cpp	20 Oct 2003 11:00:36 -0000	1.6
--- shpfresc.cpp	13 Jan 2004 01:15:27 -0000	1.7
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpgahmo.cpp	20 Oct 2003 11:00:36 -0000	1.3
--- shpgahmo.cpp	13 Jan 2004 01:15:27 -0000	1.4
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpgarty.cpp	20 Oct 2003 11:00:37 -0000	1.8
--- shpgarty.cpp	13 Jan 2004 01:15:27 -0000	1.9
***************
*** 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.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** shpgerhe.cpp	18 Nov 2003 18:20:53 -0000	1.14
--- shpgerhe.cpp	13 Jan 2004 01:15:27 -0000	1.15
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpglacr.cpp	20 Oct 2003 11:00:38 -0000	1.6
--- shpglacr.cpp	13 Jan 2004 01:15:27 -0000	1.7
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpglads.cpp	20 Oct 2003 11:00:38 -0000	1.5
--- shpglads.cpp	13 Jan 2004 01:15:27 -0000	1.6
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shphotsp.cpp	15 Nov 2003 20:48:07 -0000	1.9
--- shphotsp.cpp	13 Jan 2004 01:15:27 -0000	1.10
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shphubde.cpp	20 Oct 2003 11:00:39 -0000	1.4
--- shphubde.cpp	13 Jan 2004 01:15:27 -0000	1.5
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shphydcr.cpp	20 Oct 2003 11:00:39 -0000	1.7
--- shphydcr.cpp	13 Jan 2004 01:15:27 -0000	1.8
***************
*** 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 "vtarget.h"
! //#include "sc1ships.h"
  
  

Index: shpiceco.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shpiceco.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpiceco.cpp	15 Nov 2003 20:48:07 -0000	1.8
--- shpiceco.cpp	13 Jan 2004 01:15:27 -0000	1.9
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpilwsp.cpp	20 Oct 2003 11:00:39 -0000	1.8
--- shpilwsp.cpp	13 Jan 2004 01:15:27 -0000	1.9
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpimpka.cpp	25 Oct 2003 14:30:20 -0000	1.9
--- shpimpka.cpp	13 Jan 2004 01:15:27 -0000	1.10
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpjnkla.cpp	11 Nov 2003 23:11:55 -0000	1.10
--- shpjnkla.cpp	13 Jan 2004 01:15:27 -0000	1.11
***************
*** 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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shpjurcu.cpp	8 Jan 2004 22:22:45 -0000	1.1
--- shpjurcu.cpp	13 Jan 2004 01:15:27 -0000	1.2
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpjygst.cpp	26 Oct 2003 10:43:17 -0000	1.10
--- shpjygst.cpp	13 Jan 2004 01:15:27 -0000	1.11
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpkabwe.cpp	26 Oct 2003 10:43:17 -0000	1.10
--- shpkabwe.cpp	13 Jan 2004 01:15:27 -0000	1.11
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpkahbo.cpp	1 Nov 2003 13:24:26 -0000	1.8
--- shpkahbo.cpp	13 Jan 2004 01:15:27 -0000	1.9
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpkatas.cpp	22 Dec 2003 10:29:44 -0000	1.8
--- shpkatas.cpp	13 Jan 2004 01:15:28 -0000	1.9
***************
*** 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.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** shpkatpo.cpp	22 Dec 2003 10:29:44 -0000	1.14
--- shpkatpo.cpp	13 Jan 2004 01:15:28 -0000	1.15
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpklidr.cpp	20 Oct 2003 11:00:42 -0000	1.5
--- shpklidr.cpp	13 Jan 2004 01:15:28 -0000	1.6
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpkoaja.cpp	20 Oct 2003 11:00:42 -0000	1.3
--- shpkoaja.cpp	13 Jan 2004 01:15:28 -0000	1.4
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpkoapa.cpp	20 Oct 2003 11:00:43 -0000	1.5
--- shpkoapa.cpp	13 Jan 2004 01:15:28 -0000	1.6
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpkolfl.cpp	25 Oct 2003 14:30:20 -0000	1.8
--- shpkolfl.cpp	13 Jan 2004 01:15:28 -0000	1.9
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpktesa.cpp	20 Oct 2003 11:00:43 -0000	1.5
--- shpktesa.cpp	13 Jan 2004 01:15:28 -0000	1.6
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpleimu.cpp	4 Jan 2004 13:09:30 -0000	1.6
--- shpleimu.cpp	13 Jan 2004 01:15:28 -0000	1.7
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shplyrwa.cpp	10 Jan 2004 22:27:59 -0000	1.9
--- shplyrwa.cpp	13 Jan 2004 01:15:28 -0000	1.10
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpmekpi.cpp	4 Jan 2004 13:09:30 -0000	1.10
--- shpmekpi.cpp	13 Jan 2004 01:15:28 -0000	1.11
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpmoisp.cpp	20 Oct 2003 11:00:44 -0000	1.7
--- shpmoisp.cpp	13 Jan 2004 01:15:28 -0000	1.8
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpmontr.cpp	30 Oct 2003 19:58:21 -0000	1.6
--- shpmontr.cpp	13 Jan 2004 01:15:28 -0000	1.7
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpnarlu.cpp	20 Oct 2003 11:00:45 -0000	1.10
--- shpnarlu.cpp	13 Jan 2004 01:15:28 -0000	1.11
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpneccr.cpp	26 Oct 2003 10:43:17 -0000	1.9
--- shpneccr.cpp	13 Jan 2004 01:15:28 -0000	1.10
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpneodr.cpp	20 Oct 2003 11:00:46 -0000	1.7
--- shpneodr.cpp	13 Jan 2004 01:15:28 -0000	1.8
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpnisha.cpp	20 Oct 2003 11:00:46 -0000	1.5
--- shpnisha.cpp	13 Jan 2004 01:15:28 -0000	1.6
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpoliha.cpp	8 Nov 2003 11:19:30 -0000	1.7
--- shpoliha.cpp	13 Jan 2004 01:15:28 -0000	1.8
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpostdi.cpp	2 Nov 2003 22:39:52 -0000	1.7
--- shpostdi.cpp	13 Jan 2004 01:15:28 -0000	1.8
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shppanav.cpp	26 Oct 2003 10:43:17 -0000	1.6
--- shppanav.cpp	13 Jan 2004 01:15:28 -0000	1.7
***************
*** 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.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shpphepa.cpp	12 Nov 2003 17:19:41 -0000	1.12
--- shpphepa.cpp	13 Jan 2004 01:15:28 -0000	1.13
***************
*** 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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shpplala.cpp	8 Jan 2004 22:22:45 -0000	1.1
--- shpplala.cpp	13 Jan 2004 01:15:28 -0000	1.2
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpplane.cpp	26 Oct 2003 10:43:17 -0000	1.8
--- shpplane.cpp	13 Jan 2004 01:15:28 -0000	1.9
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpqlore.cpp	20 Oct 2003 11:00:49 -0000	1.7
--- shpqlore.cpp	13 Jan 2004 01:15:28 -0000	1.8
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpquasi.cpp	22 Dec 2003 10:29:44 -0000	1.10
--- shpquasi.cpp	13 Jan 2004 01:15:28 -0000	1.11
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpquawr.cpp	22 Dec 2003 10:29:44 -0000	1.10
--- shpquawr.cpp	13 Jan 2004 01:15:28 -0000	1.11
***************
*** 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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shpraame.cpp	27 Oct 2003 21:54:43 -0000	1.11
--- shpraame.cpp	13 Jan 2004 01:15:28 -0000	1.12
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpradfi.cpp	20 Oct 2003 11:00:52 -0000	1.4
--- shpradfi.cpp	13 Jan 2004 01:15:28 -0000	1.5
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shprekas.cpp	30 Oct 2003 19:58:21 -0000	1.6
--- shprekas.cpp	13 Jan 2004 01:15:28 -0000	1.7
***************
*** 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.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shprogsq.cpp	22 Dec 2003 10:29:44 -0000	1.12
--- shprogsq.cpp	13 Jan 2004 01:15:28 -0000	1.13
***************
*** 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.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** shpsamat.cpp	1 Nov 2003 13:24:26 -0000	1.13
--- shpsamat.cpp	13 Jan 2004 01:15:28 -0000	1.14
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpsclfr.cpp	20 Oct 2003 11:00:53 -0000	1.6
--- shpsclfr.cpp	13 Jan 2004 01:15:28 -0000	1.7
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shpsefna.cpp	26 Oct 2003 10:43:17 -0000	1.10
--- shpsefna.cpp	13 Jan 2004 01:15:28 -0000	1.11
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpstaba.cpp	20 Oct 2003 11:00:54 -0000	1.5
--- shpstaba.cpp	13 Jan 2004 01:15:28 -0000	1.6
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpstrsc.cpp	20 Oct 2003 11:00:54 -0000	1.7
--- shpstrsc.cpp	13 Jan 2004 01:15:28 -0000	1.8
***************
*** 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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shptauar.cpp	21 Nov 2003 17:17:46 -0000	1.11
--- shptauar.cpp	13 Jan 2004 01:15:28 -0000	1.12
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shptaubo.cpp	25 Oct 2003 14:30:20 -0000	1.8
--- shptaubo.cpp	13 Jan 2004 01:15:28 -0000	1.9
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shptauda.cpp	25 Oct 2003 14:30:20 -0000	1.7
--- shptauda.cpp	13 Jan 2004 01:15:28 -0000	1.8
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shptauem.cpp	25 Oct 2003 14:30:20 -0000	1.8
--- shptauem.cpp	13 Jan 2004 01:15:28 -0000	1.9
***************
*** 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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shptaufi.cpp	8 Jan 2004 22:22:45 -0000	1.1
--- shptaufi.cpp	13 Jan 2004 01:15:28 -0000	1.2
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shptaugl.cpp	25 Oct 2003 14:30:20 -0000	1.6
--- shptaugl.cpp	13 Jan 2004 01:15:28 -0000	1.7
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shptauhu.cpp	22 Dec 2003 10:29:44 -0000	1.7
--- shptauhu.cpp	13 Jan 2004 01:15:28 -0000	1.8
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shptaule.cpp	26 Oct 2003 10:43:17 -0000	1.10
--- shptaule.cpp	13 Jan 2004 01:15:28 -0000	1.11
***************
*** 1,3 ****
! #include "../ship.h"
  
  REGISTER_FILE
--- 1,3 ----
! #include "ship.h"
  
  REGISTER_FILE

Index: shptaumc.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptaumc.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shptaumc.cpp	25 Oct 2003 14:30:20 -0000	1.5
--- shptaumc.cpp	13 Jan 2004 01:15:28 -0000	1.6
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shptaume.cpp	25 Nov 2003 00:13:12 -0000	1.9
--- shptaume.cpp	13 Jan 2004 01:15:28 -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: shptausl.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/newships/shptausl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shptausl.cpp	8 Jan 2004 22:22:45 -0000	1.1
--- shptausl.cpp	13 Jan 2004 01:15:28 -0000	1.2
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shptaust.cpp	20 Oct 2003 11:00:58 -0000	1.5
--- shptaust.cpp	13 Jan 2004 01:15:28 -0000	1.6
***************
*** 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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shptauto.cpp	8 Jan 2004 22:22:45 -0000	1.1
--- shptauto.cpp	13 Jan 2004 01:15:28 -0000	1.2
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shptautu.cpp	20 Oct 2003 11:00:59 -0000	1.5
--- shptautu.cpp	13 Jan 2004 01:15:28 -0000	1.6
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shptelno.cpp	26 Oct 2003 10:43:17 -0000	1.6
--- shptelno.cpp	13 Jan 2004 01:15:28 -0000	1.7
***************
*** 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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shpterbi.cpp	8 Jan 2004 22:22:45 -0000	1.1
--- shpterbi.cpp	13 Jan 2004 01:15:28 -0000	1.2
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shptougr.cpp	20 Oct 2003 11:00:59 -0000	1.5
--- shptougr.cpp	13 Jan 2004 01:15:28 -0000	1.6
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shptrige.cpp	20 Oct 2003 11:00:59 -0000	1.5
--- shptrige.cpp	13 Jan 2004 01:15:28 -0000	1.6
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shptulra.cpp	20 Oct 2003 11:01:00 -0000	1.10
--- shptulra.cpp	13 Jan 2004 01:15:28 -0000	1.11
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpulzin.cpp	20 Oct 2003 11:01:00 -0000	1.5
--- shpulzin.cpp	13 Jan 2004 01:15:28 -0000	1.6
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpuosli.cpp	20 Oct 2003 11:01:01 -0000	1.7
--- shpuosli.cpp	13 Jan 2004 01:15:28 -0000	1.8
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpuxjba.cpp	20 Oct 2003 11:01:01 -0000	1.4
--- shpuxjba.cpp	13 Jan 2004 01:15:28 -0000	1.5
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpvelcr.cpp	20 Oct 2003 11:01:01 -0000	1.5
--- shpvelcr.cpp	13 Jan 2004 01:15:28 -0000	1.6
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpvenke.cpp	20 Oct 2003 11:01:02 -0000	1.8
--- shpvenke.cpp	13 Jan 2004 01:15:28 -0000	1.9
***************
*** 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
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpvezba.cpp	20 Oct 2003 11:01:02 -0000	1.8
--- shpvezba.cpp	13...
 
[truncated message content]

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

[<yu...@us...>]

Update of /cvsroot/timewarp/source/sc1ships
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/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:
removed ugly "../" from include directive


Index: shpandgu.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc1ships/shpandgu.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpandgu.cpp	22 Dec 2003 10:29:44 -0000	1.7
--- shpandgu.cpp	13 Jan 2004 01:15:29 -0000	1.8
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shparisk.cpp	8 Jun 2003 17:55:55 -0000	1.3
--- shparisk.cpp	13 Jan 2004 01:15:29 -0000	1.4
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpchebr.cpp	7 Oct 2003 01:54:17 -0000	1.5
--- shpchebr.cpp	13 Jan 2004 01:15:29 -0000	1.6
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpearcr.cpp	8 Jun 2003 17:55:55 -0000	1.3
--- shpearcr.cpp	13 Jan 2004 01:15:29 -0000	1.4
***************
*** 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shpilwav.cpp	30 Oct 2003 19:58:21 -0000	1.4
--- shpilwav.cpp	13 Jan 2004 01:15:29 -0000	1.5
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpkzedr.cpp	7 Oct 2003 01:54:17 -0000	1.5
--- shpkzedr.cpp	13 Jan 2004 01:15:29 -0000	1.6
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpmmrxf.cpp	26 Oct 2003 10:43:17 -0000	1.5
--- shpmmrxf.cpp	13 Jan 2004 01:15:29 -0000	1.6
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpmycpo.cpp	26 Oct 2003 10:43:17 -0000	1.5
--- shpmycpo.cpp	13 Jan 2004 01:15:29 -0000	1.6
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpshosc.cpp	8 Jun 2003 17:55:55 -0000	1.3
--- shpshosc.cpp	13 Jan 2004 01:15:29 -0000	1.4
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpspael.cpp	8 Jun 2003 17:55:55 -0000	1.3
--- shpspael.cpp	13 Jan 2004 01:15:29 -0000	1.4
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpsyrpe.cpp	22 Dec 2003 10:29:44 -0000	1.7
--- shpsyrpe.cpp	13 Jan 2004 01:15:29 -0000	1.8
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shpumgdr.cpp	1 Nov 2003 13:24:26 -0000	1.9
--- shpumgdr.cpp	13 Jan 2004 01:15:29 -0000	1.10
***************
*** 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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shpvuxin.cpp	1 Nov 2003 13:24:26 -0000	1.6
--- shpvuxin.cpp	13 Jan 2004 01:15:29 -0000	1.7
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpyehte.cpp	8 Jun 2003 17:55:55 -0000	1.3
--- shpyehte.cpp	13 Jan 2004 01:15:29 -0000	1.4
***************
*** 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/sc3ships shpclapi.cpp,1.5,1.6 shpdakvi.cpp,1.3,1.4 shpdooco.cpp,1.3,1.4 shpexqen.cpp,1.5,1.6 shpharra.cpp,1.3,1.4 shpherex.cpp,1.3,1.4 shpktacr.cpp,1.3,1.4 shplk_sa.cpp,1.3,1.4 shpowavo.cpp,1.5,1.6 shpplopl.cpp,1.3,1.4 shpvyrin.cpp,1.7,1.8 shpxchex.cpp,1.8,1.9

[<yu...@us...>]

Update of /cvsroot/timewarp/source/sc3ships
In directory sc8-pr-cvs1:/tmp/cvs-serv10225/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:
removed ugly "../" from include directive


Index: shpclapi.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/sc3ships/shpclapi.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpclapi.cpp	7 Oct 2003 01:54:17 -0000	1.5
--- shpclapi.cpp	13 Jan 2004 01:15:29 -0000	1.6
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpdakvi.cpp	8 Jun 2003 17:55:55 -0000	1.3
--- shpdakvi.cpp	13 Jan 2004 01:15:29 -0000	1.4
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpdooco.cpp	8 Jun 2003 17:55:56 -0000	1.3
--- shpdooco.cpp	13 Jan 2004 01:15:29 -0000	1.4
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpexqen.cpp	4 Jan 2004 22:07:00 -0000	1.5
--- shpexqen.cpp	13 Jan 2004 01:15:29 -0000	1.6
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpharra.cpp	8 Jun 2003 17:55:56 -0000	1.3
--- shpharra.cpp	13 Jan 2004 01:15:29 -0000	1.4
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpherex.cpp	8 Jun 2003 17:55:56 -0000	1.3
--- shpherex.cpp	13 Jan 2004 01:15:29 -0000	1.4
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpktacr.cpp	8 Jun 2003 17:55:56 -0000	1.3
--- shpktacr.cpp	13 Jan 2004 01:15:29 -0000	1.4
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shplk_sa.cpp	8 Jun 2003 17:55:56 -0000	1.3
--- shplk_sa.cpp	13 Jan 2004 01:15:29 -0000	1.4
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shpowavo.cpp	26 Oct 2003 10:43:18 -0000	1.5
--- shpowavo.cpp	13 Jan 2004 01:15:29 -0000	1.6
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shpplopl.cpp	8 Jun 2003 17:55:56 -0000	1.3
--- shpplopl.cpp	13 Jan 2004 01:15:29 -0000	1.4
***************
*** 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shpvyrin.cpp	26 Oct 2003 10:43:18 -0000	1.7
--- shpvyrin.cpp	13 Jan 2004 01:15:29 -0000	1.8
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shpxchex.cpp	26 Oct 2003 10:43:18 -0000	1.8
--- shpxchex.cpp	13 Jan 2004 01:15:29 -0000	1.9
***************
*** 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