Thread: [Fftrader-cvs] fftrader/src fftfile.cpp,1.1,1.2 fftfile.h,1.1,1.2 log.cpp,1.1,1.2 log.h,1.1,1.2 main

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/fftrader/fftrader/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26008/src

Modified Files:
	fftfile.cpp fftfile.h log.cpp log.h main.cpp map.cpp 
	mapobject.cpp scenario.cpp scenario.h shop.cpp shop.h 
	units.cpp units.h 
Log Message:
Added Logger

Index: units.cpp
===================================================================
RCS file: /cvsroot/fftrader/fftrader/src/units.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** units.cpp	19 Aug 2005 07:32:29 -0000	1.1
--- units.cpp	19 Aug 2005 08:22:34 -0000	1.2
***************
*** 685,689 ****
  		this->RemoveWeaponFromSlot(slotid);
  		this->NextWeapon();
! 		if (LOG) printf("Removed and changed weapon\n");
  	}
  }
--- 685,689 ----
  		this->RemoveWeaponFromSlot(slotid);
  		this->NextWeapon();
! 		Log::Write("Removed and changed weapon");
  	}
  }
***************
*** 1089,1096 ****
  void Unit::FPK_NewImages(std::string fpk, std::string imagename)
  {
! 	if (LOG) printf("FPK_NewImages: Loading new image (%s) from fpk %s\n",imagename.c_str(),fpk.c_str());
  	usingfpk=fpk;
  	imgload=imagename;
! 	if (LOG) printf("FPK_NewImages: Freeing existing images\n");
  	FreeImages();
  	if(hasShield)
--- 1089,1096 ----
  void Unit::FPK_NewImages(std::string fpk, std::string imagename)
  {
! 	Log::Write("FPK_NewImages: Loading new image (%s) from fpk %s",imagename.c_str(),fpk.c_str());
  	usingfpk=fpk;
  	imgload=imagename;
! 	Log::Write("FPK_NewImages: Freeing existing images");
  	FreeImages();
  	if(hasShield)
***************
*** 1104,1111 ****
  		hasShield=false;
  	}
! 	if (LOG) printf("FPK_NewImages: Loading new images\n");
  	LoadImages(0, 71);
  	int i;
! 	if (LOG) printf("FPK_NewImages: Making new bitmasks\n");
  	for (i=0; i<UNITS_NUM_FRAMES; i++)
  	{
--- 1104,1111 ----
  		hasShield=false;
  	}
! 	Log::Write("FPK_NewImages: Loading new images");
  	LoadImages(0, 71);
  	int i;
! 	Log::Write("FPK_NewImages: Making new bitmasks");
  	for (i=0; i<UNITS_NUM_FRAMES; i++)
  	{
***************
*** 1127,1131 ****
  	if (end<0) { end=0; }
  	if (start<0) { start=0; }
! 	if (LOG) printf("Unit::LoadImages: Loading base image (%s) from fpk %s\n",imgload.c_str(),usingfpk.c_str());
  	temp=FPK_LoadIMG(usingfpk, imgload);
  	if (dispimg)
--- 1127,1131 ----
  	if (end<0) { end=0; }
  	if (start<0) { start=0; }
! 	Log::Write("Unit::LoadImages: Loading base image (%s) from fpk %s",imgload.c_str(),usingfpk.c_str());
  	temp=FPK_LoadIMG(usingfpk, imgload);
  	if (dispimg)
***************
*** 1134,1149 ****
  		dispimg=0;
  	}
! 	if (LOG) printf("Unit::LoadImages: Setting display image\n");
  	dispimg=rotozoomSurface(temp, 0, 0.5, SMOOTH);
  	if (cr>0 || cg>0 || cb>0)
  	{
! 		if (LOG) printf("Unit::LoadImages: Colorizing images\n");
  		ColorizeSurface(temp, cr, cg, cb);
  		ColorizeSurface(dispimg, cr, cg, cb);
  	}
! 	if (LOG) printf("Unit::LoadImages: Freeing images and reloading: ");
  	for (i=start; i<=end; i++)
  	{
! 		if (LOG) printf("%d, ",i);
  		if (image[i])
  		{
--- 1134,1149 ----
  		dispimg=0;
  	}
! 	Log::Write("Unit::LoadImages: Setting display image");
  	dispimg=rotozoomSurface(temp, 0, 0.5, SMOOTH);
  	if (cr>0 || cg>0 || cb>0)
  	{
! 		Log::Write("Unit::LoadImages: Colorizing images");
  		ColorizeSurface(temp, cr, cg, cb);
  		ColorizeSurface(dispimg, cr, cg, cb);
  	}
! 	Log::Writen("Unit::LoadImages: Freeing images and reloading: ");
  	for (i=start; i<=end; i++)
  	{
! 		Log::Writen("%d, ",i);
  		if (image[i])
  		{
***************
*** 1153,1160 ****
  		image[i]=rotozoomSurface(temp, 360-i*angleinc, zoom, SMOOTH);
  	}
! 	if (LOG) printf("\n");
  	if (hasShield)
  	{
! 		if (LOG) printf("Loading shield\n");
  		SDL_FreeSurface(temp);
  		temp=0;
--- 1153,1160 ----
  		image[i]=rotozoomSurface(temp, 360-i*angleinc, zoom, SMOOTH);
  	}
! 	Log::Writen("\n");
  	if (hasShield)
  	{
! 		Log::Write("Loading shield");
  		SDL_FreeSurface(temp);
  		temp=0;

Index: main.cpp
===================================================================
RCS file: /cvsroot/fftrader/fftrader/src/main.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main.cpp	19 Aug 2005 07:32:29 -0000	1.1
--- main.cpp	19 Aug 2005 08:22:34 -0000	1.2
***************
*** 58,63 ****
  int SMOOTH=1;
  bool FPSSHOW=false;
! bool LOG=false;
! std::string VERSION="0.66";

  static int mainLoop();
--- 58,62 ----
  int SMOOTH=1;
  bool FPSSHOW=false;
! std::string VERSION="0.70 alpha";

  static int mainLoop();
***************
*** 100,108 ****
  			if (!strcmp(argv[i],"-log"))
  			{
! 				LOG=true;
  			}
  		}
  	}
! 	if (LOG) printf("Final Frontier Trader\nversion %s\nby TomT64\n------------\n\n",VERSION.c_str());
  	// We initalize the random number generator
  	srand(time(NULL));
--- 99,107 ----
  			if (!strcmp(argv[i],"-log"))
  			{
! 				Log::Init("fft.log");
  			}
  		}
  	}
! 	Log::Write("Final Frontier Trader\nversion %s\nby TomT64\n------------\n",VERSION.c_str());
  	// We initalize the random number generator
  	srand(time(NULL));
***************
*** 115,131 ****
  	if (!init)
  	{
! 		printf("Failed to initialize PHYSFS.  Reason: %s\n",PHYSFS_getLastError());
  		exit(1);
  	}
! 	if (LOG)
! 	{
! 		printf("PHYSFS initialized successfully\n");
! 		char **i;
! 		for (i = PHYSFS_getSearchPath(); *i != NULL; i++)
! 		printf("[%s] is in the search path.at the beginning of execution\n", *i);
! 	}
  	PHYSFS_addToSearchPath(PHYSFS_getBaseDir(), 0); //fpk dir
  	PHYSFS_setWriteDir(PHYSFS_getBaseDir());
! 	if (LOG) printf("Loading Preferences\n");
  	prefs=new Preferences("prefs");
  	delete fftinput;
--- 114,128 ----
  	if (!init)
  	{
! 		Log::Write("Failed to initialize PHYSFS.  Reason: %s",PHYSFS_getLastError());
  		exit(1);
  	}
! 	Log::Write("PHYSFS initialized successfully");
! 	char **i;
! 	for (i = PHYSFS_getSearchPath(); *i != NULL; i++)
! 	Log::Write("[%s] is in the search path.at the beginning of execution", *i);
! 
  	PHYSFS_addToSearchPath(PHYSFS_getBaseDir(), 0); //fpk dir
  	PHYSFS_setWriteDir(PHYSFS_getBaseDir());
! 	Log::Write("Loading Preferences");
  	prefs=new Preferences("prefs");
  	delete fftinput;
***************
*** 136,173 ****

  	if(TTF_Init()==-1) {
! 	printf("TTF_Init: %s\n", TTF_GetError());
  	exit(2);
  	}
! 	if (LOG) printf("SDL_ttf initialized successfully\n");

  	// load font
  	font=LoadTTF("fonts/arial.ttf", 10);
  	if(!font) {
! 	printf("Unable to Open font 'fonts/arial.ttf' -  TTF_OpenFont: %s\n", TTF_GetError());
  	// handle error
  	}
  	font2=LoadTTF("fonts/arial.ttf", 14);
  	if(!font2) {
! 	printf("Unable to Open font 'fonts/arial.ttf' - TTF_OpenFont: %s\n", TTF_GetError());
  	// handle error
  	}
! 	if (LOG) printf("Main Fonts loaded\n");

  	/* initialize SDL */
  	#ifdef DEBUG
  	if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) {
! 	fprintf(stderr, "Could not initialize SDL: %s\n",
! 			SDL_GetError());
  		return -1;
  	}
  	#else
  	if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO) < 0 ) {
! 	fprintf(stderr, "Could not initialize SDL: %s\n",
! 			SDL_GetError());
  		return -1;
  	}
  	#endif

! 	if (LOG) printf("SDL initialized successfully\n");

  	//atexit(SDL_Quit);
--- 133,168 ----

  	if(TTF_Init()==-1) {
! 	Log::Write("TTF_Init: %s", TTF_GetError());
  	exit(2);
  	}
! 	Log::Write("SDL_ttf initialized successfully");

  	// load font
  	font=LoadTTF("fonts/arial.ttf", 10);
  	if(!font) {
! 	Log::Write("Unable to Open font 'fonts/arial.ttf' -  TTF_OpenFont: %s", TTF_GetError());
  	// handle error
  	}
  	font2=LoadTTF("fonts/arial.ttf", 14);
  	if(!font2) {
! 	Log::Write("Unable to Open font 'fonts/arial.ttf' - TTF_OpenFont: %s", TTF_GetError());
  	// handle error
  	}
! 	Log::Write("Main Fonts loaded");

  	/* initialize SDL */
  	#ifdef DEBUG
  	if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) {
! 		Log::Write("Could not initialize SDL: %s",SDL_GetError());
  		return -1;
  	}
  	#else
  	if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO) < 0 ) {
! 		Log::Write("Could not initialize SDL: %s",SDL_GetError());
  		return -1;
  	}
  	#endif

! 	Log::Write("SDL initialized successfully");

  	//atexit(SDL_Quit);
***************
*** 177,191 ****
  	SDL_Surface *icon = LoadICON("gfx/ico/fftico.png");
  	SDL_WM_SetIcon(icon, NULL);
! 	if (LOG) printf("Icon and caption in place\n");

  	/* create window */
  	screen = SDL_SetVideoMode(400, 300, 0, SDL_HWSURFACE|SDL_DOUBLEBUF);
  	//CenterWindow();
! 	if (LOG) printf("Video mode set and centered\n");

  	SDL_Surface *bg = LoadIMG("gfx/startupbg.png");
  	DrawIMG(bg,0,0);
  	SDL_Flip(screen);
! 	if (LOG) printf("Splash screen displayed\n");

  	stars = new StarField;
--- 172,186 ----
  	SDL_Surface *icon = LoadICON("gfx/ico/fftico.png");
  	SDL_WM_SetIcon(icon, NULL);
! 	Log::Write("Icon and caption in place");

  	/* create window */
  	screen = SDL_SetVideoMode(400, 300, 0, SDL_HWSURFACE|SDL_DOUBLEBUF);
  	//CenterWindow();
! 	Log::Write("Video mode set and centered");

  	SDL_Surface *bg = LoadIMG("gfx/startupbg.png");
  	DrawIMG(bg,0,0);
  	SDL_Flip(screen);
! 	Log::Write("Splash screen displayed");

  	stars = new StarField;
***************
*** 193,197 ****
  	stars->Init(SCREEN_WIDTH, SCREEN_HEIGHT);
  	stars2->Init(SCREEN_WIDTH, SCREEN_HEIGHT);
! 	if (LOG) printf("Beginning warp stars initialized\n");

  	char **k;
--- 188,192 ----
  	stars->Init(SCREEN_WIDTH, SCREEN_HEIGHT);
  	stars2->Init(SCREEN_WIDTH, SCREEN_HEIGHT);
! 	Log::Write("Beginning warp stars initialized");

  	char **k;
***************
*** 208,229 ****
  	}
  	PHYSFS_freeList(fpklist);
! 	if (LOG) printf("All FPKs placed in search path\n");

  	ship = new Unit;
  	ship->Init(0, 0, "gfx/ship/ship.png","base.fpk",(float)0.1);
! 	if (LOG) printf("Main ship initialized\n");

  	map = new Map;
  	map->Init(1);
! 	if (LOG) printf("Map initialized\n");

  	if(Mix_OpenAudio(22050, AUDIO_S16SYS, 2, 2048) < 0)
  	{
! 		printf("Warning: Couldn't set 22050 Hz 16-bit audio\n\
! 		- Reason: %s\n", SDL_GetError());
  	}
  	shot = LoadSound("sound/shoot.wav");
  	explode = LoadSound("sound/expl01.wav");
! 	if (LOG) printf("Audio initialized and sounds loaded\n");

  	gui2=new GUI;
--- 203,223 ----
  	}
  	PHYSFS_freeList(fpklist);
! 	Log::Write("All FPKs placed in search path");

  	ship = new Unit;
  	ship->Init(0, 0, "gfx/ship/ship.png","base.fpk",(float)0.1);
! 	Log::Write("Main ship initialized");

  	map = new Map;
  	map->Init(1);
! 	Log::Write("Map initialized");

  	if(Mix_OpenAudio(22050, AUDIO_S16SYS, 2, 2048) < 0)
  	{
! 		Log::Write("Warning: Couldn't set 22050 Hz 16-bit audio\n- Reason: %s", SDL_GetError());
  	}
  	shot = LoadSound("sound/shoot.wav");
  	explode = LoadSound("sound/expl01.wav");
! 	Log::Write("Audio initialized and sounds loaded");

  	gui2=new GUI;
***************
*** 252,288 ****
  	else screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 0, SDL_HWSURFACE|SDL_DOUBLEBUF);
  	CenterWindow();
! 	if (LOG)
! 	{
! 		printf("Main window set to 640x480 ");
! 		if (fullscreen) printf("at fullscreen ");
! 		else printf("at windowed ");
! 		if (software) printf("software mode");
! 		else printf("hardware mode");
! 		printf(" and centered\n");
! 	}

  	int done=0;
  	int maintemp;
  	int GUIresult;
! 	if (LOG) printf("Proceeding to main loop\n");
  	while(!done)
  	{
  		GUIresult=RunStartingGUI(SCREEN_WIDTH, SCREEN_HEIGHT);
! 		if (LOG) printf("Option from Starting GUI selected\n");
  		if (GUIresult==-1)
  		{
  			done=1;
! 			if (LOG) printf("Exiting game\n");
  		}
  		if (GUIresult==2)
  		{
  			bool goahead=false;
! 			if (LOG) printf("Entering New Game\n");
  			goahead=LoadScenario();
  			if (goahead)
  			{
! 				if (LOG) printf("Proceeding to main game play\n");
  				maintemp=mainLoop();
! 				if (LOG) printf("Main gameplay exited\n");
  				if (maintemp==-1) done=1;
  			}
--- 246,279 ----
  	else screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 0, SDL_HWSURFACE|SDL_DOUBLEBUF);
  	CenterWindow();
! 	Log::Writen("Main window set to 640x480 ");
! 	if (fullscreen) Log::Writen("at fullscreen ");
! 	else Log::Writen("at windowed ");
! 	if (software) Log::Writen("software mode");
! 	else Log::Writen("hardware mode");
! 	Log::Write(" and centered");

  	int done=0;
  	int maintemp;
  	int GUIresult;
! 	Log::Write("Proceeding to main loop");
  	while(!done)
  	{
  		GUIresult=RunStartingGUI(SCREEN_WIDTH, SCREEN_HEIGHT);
! 		Log::Write("Option from Starting GUI selected");
  		if (GUIresult==-1)
  		{
  			done=1;
! 			Log::Write("Exiting game");
  		}
  		if (GUIresult==2)
  		{
  			bool goahead=false;
! 			Log::Write("Entering New Game");
  			goahead=LoadScenario();
  			if (goahead)
  			{
! 				Log::Write("Proceeding to main game play");
  				maintemp=mainLoop();
! 				Log::Write("Main gameplay exited");
  				if (maintemp==-1) done=1;
  			}
***************
*** 308,312 ****
  	TTF_Quit();
  	SDL_Quit();
! 	if (LOG) printf("Thank you for playing!\n");

  	return 0;
--- 299,303 ----
  	TTF_Quit();
  	SDL_Quit();
! 	Log::Write("Thank you for playing!");

  	return 0;
***************
*** 315,319 ****
  static int AskToQuitGame()
  {
! 	if (LOG) printf("AskToQuitGame()\n");
  	SDL_Event event;
  	SDL_Surface *screen=SDL_GetVideoSurface();
--- 306,310 ----
  static int AskToQuitGame()
  {
! 	Log::Write("AskToQuitGame()");
  	SDL_Event event;
  	SDL_Surface *screen=SDL_GetVideoSurface();
***************
*** 424,428 ****
  static int InGameMenu()
  {
! 	if (LOG) printf("InGameMenu()\n");
  	SDL_Event event;
  	SDL_Surface *screen=SDL_GetVideoSurface();
--- 415,419 ----
  static int InGameMenu()
  {
! 	Log::Write("InGameMenu()");
  	SDL_Event event;
  	SDL_Surface *screen=SDL_GetVideoSurface();
***************
*** 524,535 ****
  	{
  		bool goahead;
! 		if (LOG) printf("LoadScenario()\n");
! 		if (LOG) printf("Entering Scenario selection\n");
  		std::string scenselect=ChooseScenario();
  		if (!strcmp(scenselect.c_str(),"")) return false;
! 		if (LOG) printf("Scenario Selection is %s\n",scenselect.c_str());
  		delete mainScen;
  		mainScen = new Scenario();
! 		if (LOG) printf("Reading Scenario information\n");
  		mainScen->ReadOnly(scenselect);
  		goahead=ShipSelect(zoom, scenselect);
--- 515,526 ----
  	{
  		bool goahead;
! 		Log::Write("LoadScenario()");
! 		Log::Write("Entering Scenario selection");
  		std::string scenselect=ChooseScenario();
  		if (!strcmp(scenselect.c_str(),"")) return false;
! 		Log::Write("Scenario Selection is %s",scenselect.c_str());
  		delete mainScen;
  		mainScen = new Scenario();
! 		Log::Write("Reading Scenario information");
  		mainScen->ReadOnly(scenselect);
  		goahead=ShipSelect(zoom, scenselect);
***************
*** 541,545 ****
  static bool ShipSelect(float zoom, std::string scenselect)
  {
! 	if (LOG) printf("Entering ship selection\n");
  	SDL_Surface *screen=SDL_GetVideoSurface();
  	ship->SetZoom(zoom);
--- 532,536 ----
  static bool ShipSelect(float zoom, std::string scenselect)
  {
! 	Log::Write("Entering ship selection");
  	SDL_Surface *screen=SDL_GetVideoSurface();
  	ship->SetZoom(zoom);
***************
*** 573,577 ****
  	}
  	Uint32 ticks=SDL_GetTicks();
! 	if (LOG) printf("Loading Game...\n");
  	SDL_FillRect(screen,0,0);
  	centerString(font2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, "Loading Game....", white);
--- 564,568 ----
  	}
  	Uint32 ticks=SDL_GetTicks();
! 	Log::Write("Loading Game...");
  	SDL_FillRect(screen,0,0);
  	centerString(font2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, "Loading Game....", white);
***************
*** 580,610 ****
  	map = new Map;
  	map->Init(zoom);
! 	if (LOG) printf("Setting map to scenario\n");
  	mainScen->SetMap(map);
! 	if (LOG) printf("Loading map file\n");
  	LoadMap(map, mainScen->GetMapFn(), zoom);
  	delete gui2;
! 	if (LOG) printf("Creating opening message\n");
  	std::string message=mainScen->GetOpenMessage();
  	gui2=MakeCenterOKWindow(message);
! 	if (LOG) printf("Placing ship\n");
  	ship->SetAngle(mainScen->GetStartAngle());
! 	if (LOG) printf("Ship:   Angle: %d",mainScen->GetStartAngle());
  	ship->SetSpeed(mainScen->GetStartSpeed());
! 	if (LOG) printf(" Speed: %d",mainScen->GetStartSpeed());
  	ship->SetWarp(false);
  	ship->SetX(mainScen->GetStartX());
! 	if (LOG) printf(" X: %d",mainScen->GetStartX());
  	ship->SetY(mainScen->GetStartY());
! 	if (LOG) printf(" Y: %d",mainScen->GetStartY());
! 	if (LOG) printf(" Remaining credits: %d\n",ship->GetCredits());
  	//ship->SetZoom(zoom);
! 	//if (LOG) printf("Loading images\n");
  	//ship->ReloadImages();
! 	if (LOG) printf("Adjusting shoot point\n");
  	ship->AdjustShootPoint();
! 	if (LOG) printf("Adding main ship to map\n");
  	map->AddMainShip(ship);
! 	if (LOG) printf("Starting up Scenario\n");
  	mainScen->Startup();
  	Uint32 timepassed=SDL_GetTicks()-ticks;
--- 571,601 ----
  	map = new Map;
  	map->Init(zoom);
! 	Log::Write("Setting map to scenario");
  	mainScen->SetMap(map);
! 	Log::Write("Loading map file");
  	LoadMap(map, mainScen->GetMapFn(), zoom);
  	delete gui2;
! 	Log::Write("Creating opening message");
  	std::string message=mainScen->GetOpenMessage();
  	gui2=MakeCenterOKWindow(message);
! 	Log::Write("Placing ship");
  	ship->SetAngle(mainScen->GetStartAngle());
! 	Log::Writen("Ship:   Angle: %d",mainScen->GetStartAngle());
  	ship->SetSpeed(mainScen->GetStartSpeed());
! 	Log::Writen(" Speed: %d",mainScen->GetStartSpeed());
  	ship->SetWarp(false);
  	ship->SetX(mainScen->GetStartX());
! 	Log::Writen(" X: %d",mainScen->GetStartX());
  	ship->SetY(mainScen->GetStartY());
! 	Log::Writen(" Y: %d",mainScen->GetStartY());
! 	Log::Write(" Remaining credits: %d",ship->GetCredits());
  	//ship->SetZoom(zoom);
! 	//Log::Write("Loading images");
  	//ship->ReloadImages();
! 	Log::Write("Adjusting shoot point");
  	ship->AdjustShootPoint();
! 	Log::Write("Adding main ship to map");
  	map->AddMainShip(ship);
! 	Log::Write("Starting up Scenario");
  	mainScen->Startup();
  	Uint32 timepassed=SDL_GetTicks()-ticks;
***************
*** 612,616 ****
  	Uint32 secs=(unsigned int)((double)timepassed/1000.0);
  	Uint32 mins=(unsigned int)((double)secs/60.0);
! 	if (LOG) printf("Scenario loaded in %d minutes, %d seconds, and %d milliseconds\n",mins,secs,ms);
  	return true;
  }
--- 603,607 ----
  	Uint32 secs=(unsigned int)((double)timepassed/1000.0);
  	Uint32 mins=(unsigned int)((double)secs/60.0);
! 	Log::Write("Scenario loaded in %d minutes, %d seconds, and %d milliseconds",mins,secs,ms);
  	return true;
  }
***************
*** 618,622 ****
  static int mainLoop()
  {
! 	if (LOG) printf("Main Loop begin\n");
  	SDL_Event event;
  	SDL_Surface *screen=SDL_GetVideoSurface();
--- 609,613 ----
  static int mainLoop()
  {
! 	Log::Write("Main Loop begin");
  	SDL_Event event;
  	SDL_Surface *screen=SDL_GetVideoSurface();
***************
*** 665,669 ****
  	map->CheckSectors(sx, sy);
  	float zoom=0.5;
! 	if (LOG) printf("Variables set, displaying opening message\n");
  	TTF_Font *font9=TTF_OpenFont("fonts/arial.ttf", 9);
  	while(!done)
--- 656,660 ----
  	map->CheckSectors(sx, sy);
  	float zoom=0.5;
! 	Log::Write("Variables set, displaying opening message");
  	TTF_Font *font9=TTF_OpenFont("fonts/arial.ttf", 9);
  	while(!done)
***************
*** 744,748 ****
  	char disppause[100];
  	sprintf(disppause, "Press '%s' to unpause", fftinput->GetPauseStr().c_str());
! 	if (LOG) printf("Entering gameplay loop\n");
  	while(!done)
  	{
--- 735,739 ----
  	char disppause[100];
  	sprintf(disppause, "Press '%s' to unpause", fftinput->GetPauseStr().c_str());
! 	Log::Write("Entering gameplay loop");
  	while(!done)
  	{
***************
*** 757,761 ****
  					{
  						paused=true;
! 						if (LOG) printf("Game was paused because the window lost focus\n");
  						if (paused)
  						{
--- 748,752 ----
  					{
  						paused=true;
! 						Log::Write("Game was paused because the window lost focus");
  						if (paused)
  						{
***************
*** 807,815 ****
  					{
  						zoom+=0.25;
! 						if (LOG) printf("Zooming ship\n");
  						ship->SetZoom(zoom);
! 						if (LOG) printf("Loading Ship images\n");
  						ship->ReloadImages();
! 						if (LOG) printf("Zooming map\n");
  						map->SetZoom(zoom);
  					}
--- 798,806 ----
  					{
  						zoom+=0.25;
! 						Log::Write("Zooming ship");
  						ship->SetZoom(zoom);
! 						Log::Write("Loading Ship images");
  						ship->ReloadImages();
! 						Log::Write("Zooming map");
  						map->SetZoom(zoom);
  					}
***************
*** 820,828 ****
  					{
  						zoom-=0.25;
! 						if (LOG) printf("Zooming ship\n");
  						ship->SetZoom(zoom);
! 						if (LOG) printf("Loading Ship images\n");
  						ship->ReloadImages();
! 						if (LOG) printf("Zooming map\n");
  						map->SetZoom(zoom);
  					}
--- 811,819 ----
  					{
  						zoom-=0.25;
! 						Log::Write("Zooming ship");
  						ship->SetZoom(zoom);
! 						Log::Write("Loading Ship images");
  						ship->ReloadImages();
! 						Log::Write("Zooming map");
  						map->SetZoom(zoom);
  					}

Index: units.h
===================================================================
RCS file: /cvsroot/fftrader/fftrader/src/units.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** units.h	19 Aug 2005 07:32:29 -0000	1.1
--- units.h	19 Aug 2005 08:22:34 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
  #include "graphics.h"
  #include "fftfile.h"
+ #include "log.h"
  #include "math.h"

***************
*** 21,25 ****
  extern Mix_Chunk *shot;
  extern int SMOOTH;
- extern bool LOG;

  typedef struct{
--- 22,25 ----

Index: shop.cpp
===================================================================
RCS file: /cvsroot/fftrader/fftrader/src/shop.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shop.cpp	19 Aug 2005 07:32:29 -0000	1.1
--- shop.cpp	19 Aug 2005 08:22:34 -0000	1.2
***************
*** 20,24 ****
  ShipyardShop::ShipyardShop(int sx, int sy, int sw, int sh, FPKShip **fpkships, bool sstarting)
  {
! 	if (LOG) printf("New ShipyardShop\n");
  	int i;
  	x=sx;
--- 20,24 ----
  ShipyardShop::ShipyardShop(int sx, int sy, int sw, int sh, FPKShip **fpkships, bool sstarting)
  {
! 	Log::Write("New ShipyardShop");
  	int i;
  	x=sx;
***************
*** 66,70 ****
  		}
  	}
! 	if (LOG) printf("Max FPKShips=%d\n",shipmax);
  	cur=0;
  	curcolor=0;
--- 66,70 ----
  		}
  	}
! 	Log::Write("Max FPKShips=%d",shipmax);
  	cur=0;
  	curcolor=0;
***************
*** 154,188 ****
  				if ((int)ship->GetCredits()>=(ships[cur]->GetPrice()-(ship->GetPriceBought()*0.75)))
  				{
! 					if (LOG) printf("Giving New Ship\n");
! 					if (LOG) printf("Colorizing ship\n");
  					ship->Colorize(cr[curcolor], cg[curcolor], cb[curcolor]);
! 					if (LOG) printf("Getting New ship images\n");
  					ship->FPK_NewImages(ships[cur]->GetFPK(), ships[cur]->GetImageFN());
! 					if (LOG) printf("Setting max speed\n");
  					ship->SetMaxSpeed(engine->GetMaxSpeed());
! 					if (LOG) printf("Setting max warp speed\n");
  					ship->SetMaxWarp(engine->GetMaxWarpSpeed());
! 					if (LOG) printf("Setting max safe warp speed\n");
  					ship->SetMaxSafeWarp(engine->GetMaxSafeWarpSpeed());
! 					if (LOG) printf("Setting turn delay\n");
  					ship->SetTurnDelay(engine->GetTurnDelay());
! 					if (LOG) printf("Setting warp turn delay\n");
  					ship->SetWarpTurnDelay(engine->GetWarpTurnDelay());
! 					if (LOG) printf("Filling slots\n");
  					ship->FillSlots(ships[cur]->GetSlots(),ships[cur]->GetSlotCount());
! 					if (LOG) printf("Setting shoot point\n");
  					ship->SetShootPoint(ships[cur]->GetShootX(),ships[cur]->GetShootY());
! 					if (LOG) printf("Setting overheat\n");
  					ship->SetOverHeatMax(engine->GetOverHeatMax());
! 					if (LOG) printf("Adding weapons\n");
  					ship->AddWeaponToSlot(101,"base.fpk","gfx/object/bullet.png");
  					//ship->AddWeaponToSlot(102,"base.fpk","gfx/object/bullet2.png");
! 					if (LOG && ships[cur]->HasShield()) printf("Adding shield\n");
  					if (ships[cur]->HasShield()) ship->AddShield(ships[cur]->GetShieldFN());
! 					if (LOG) printf("Setting battle hits\n");
  					ship->SetHullHitMax(ships[cur]->GetHullHitMax());
  					ship->SetShieldHitMax(10);
  					ship->ResetHits();
! 					if (LOG) printf("Ship loaded\n");
  					ship->SetCredits((int)(ship->GetCredits()-(ships[cur]->GetPrice()-(ship->GetPriceBought()*0.75))));
  					ship->SetPriceBought(ships[cur]->GetPrice());
--- 154,188 ----
  				if ((int)ship->GetCredits()>=(ships[cur]->GetPrice()-(ship->GetPriceBought()*0.75)))
  				{
! 					Log::Write("Giving New Ship");
! 					Log::Write("Colorizing ship");
  					ship->Colorize(cr[curcolor], cg[curcolor], cb[curcolor]);
! 					Log::Write("Getting New ship images");
  					ship->FPK_NewImages(ships[cur]->GetFPK(), ships[cur]->GetImageFN());
! 					Log::Write("Setting max speed");
  					ship->SetMaxSpeed(engine->GetMaxSpeed());
! 					Log::Write("Setting max warp speed");
  					ship->SetMaxWarp(engine->GetMaxWarpSpeed());
! 					Log::Write("Setting max safe warp speed");
  					ship->SetMaxSafeWarp(engine->GetMaxSafeWarpSpeed());
! 					Log::Write("Setting turn delay");
  					ship->SetTurnDelay(engine->GetTurnDelay());
! 					Log::Write("Setting warp turn delay");
  					ship->SetWarpTurnDelay(engine->GetWarpTurnDelay());
! 					Log::Write("Filling slots");
  					ship->FillSlots(ships[cur]->GetSlots(),ships[cur]->GetSlotCount());
! 					Log::Write("Setting shoot point");
  					ship->SetShootPoint(ships[cur]->GetShootX(),ships[cur]->GetShootY());
! 					Log::Write("Setting overheat");
  					ship->SetOverHeatMax(engine->GetOverHeatMax());
! 					Log::Write("Adding weapons");
  					ship->AddWeaponToSlot(101,"base.fpk","gfx/object/bullet.png");
  					//ship->AddWeaponToSlot(102,"base.fpk","gfx/object/bullet2.png");
! 					if (ships[cur]->HasShield()) Log::Write("Adding shield");
  					if (ships[cur]->HasShield()) ship->AddShield(ships[cur]->GetShieldFN());
! 					Log::Write("Setting battle hits");
  					ship->SetHullHitMax(ships[cur]->GetHullHitMax());
  					ship->SetShieldHitMax(10);
  					ship->ResetHits();
! 					Log::Write("Ship loaded");
  					ship->SetCredits((int)(ship->GetCredits()-(ships[cur]->GetPrice()-(ship->GetPriceBought()*0.75))));
  					ship->SetPriceBought(ships[cur]->GetPrice());
***************
*** 325,332 ****
  			cury+=80;
  		}
! 		if (LOG) printf("column=%d, cury=%d\n",column,cury);
  		curx=x+(column*100)+80;
  		slotshow->MakeWindow(curx, cury, 80, 66);
! 		if (LOG) printf("Window %d, %d, %d, %d\n",curx, cury, 80, 66);
  		sprintf(c, "ID: %d", slots[i].id);
  		std::string slotid=c;
--- 325,332 ----
  			cury+=80;
  		}
! 		Log::Write("column=%d, cury=%d",column,cury);
  		curx=x+(column*100)+80;
  		slotshow->MakeWindow(curx, cury, 80, 66);
! 		Log::Write("Window %d, %d, %d, %d",curx, cury, 80, 66);
  		sprintf(c, "ID: %d", slots[i].id);
  		std::string slotid=c;
***************
*** 354,358 ****
  int NewShipOptions(int w, int h, FPKShip **fpkships)
  {
! 	if (LOG) printf("Inside Ship options\n");
  	SDL_Event event;
  	ShipyardShop *shipyard=new ShipyardShop(0,0,w,h,fpkships,true);
--- 354,358 ----
  int NewShipOptions(int w, int h, FPKShip **fpkships)
  {
! 	Log::Write("Inside Ship options");
  	SDL_Event event;
  	ShipyardShop *shipyard=new ShipyardShop(0,0,w,h,fpkships,true);
***************
*** 373,377 ****
  	}
  	delete shipyard;
! 	if (LOG) printf("End Ship options\n");
  	return done;
  }
--- 373,377 ----
  	}
  	delete shipyard;
! 	Log::Write("End Ship options");
  	return done;
  }

Index: fftfile.h
===================================================================
RCS file: /cvsroot/fftrader/fftrader/src/fftfile.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fftfile.h	19 Aug 2005 07:32:29 -0000	1.1
--- fftfile.h	19 Aug 2005 08:22:34 -0000	1.2
***************
*** 15,18 ****
--- 15,19 ----
  #include "aries.h"
  #include "input.h"
+ #include "log.h"

  using aries::newNode;

Index: shop.h
===================================================================
RCS file: /cvsroot/fftrader/fftrader/src/shop.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shop.h	19 Aug 2005 07:32:29 -0000	1.1
--- shop.h	19 Aug 2005 08:22:34 -0000	1.2
***************
*** 8,12 ****

  extern Unit *ship;
- extern bool LOG;

  typedef struct{
--- 8,11 ----

Index: scenario.cpp
===================================================================
RCS file: /cvsroot/fftrader/fftrader/src/scenario.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scenario.cpp	19 Aug 2005 07:32:29 -0000	1.1
--- scenario.cpp	19 Aug 2005 08:22:34 -0000	1.2
***************
*** 10,14 ****
  	Uint32 secs=0;
  	Uint32 mins=0;
! 	if (LOG) printf("LoadMap() at ticks=%d\n",ticks);
  	struct Local
  	{
--- 10,14 ----
  	Uint32 secs=0;
  	Uint32 mins=0;
! 	Log::Write("LoadMap() at ticks=%d",ticks);
  	struct Local
  	{
***************
*** 41,45 ****
  		secs=(unsigned int)((double)timepassed/1000.0);
  		mins=(unsigned int)((double)secs/60.0);
! 		if (LOG) printf("Loading Map Objects, %d minutes, %d seconds, %d ms after LoadMap() begin\n", mins, secs, ms);
  		for (iter = mapobjects.begin(); iter != mapobjects.end(); iter++)
  		{
--- 41,45 ----
  		secs=(unsigned int)((double)timepassed/1000.0);
  		mins=(unsigned int)((double)secs/60.0);
! 		Log::Write("Loading Map Objects, %d minutes, %d seconds, %d ms after LoadMap() begin", mins, secs, ms);
  		for (iter = mapobjects.begin(); iter != mapobjects.end(); iter++)
  		{
***************
*** 77,81 ****
  		secs=(unsigned int)((double)timepassed/1000.0);
  		mins=(unsigned int)((double)secs/60.0);
! 		if (LOG) printf("Done Loading Map Objects, %d minutes, %d seconds, %d ms after LoadMap() begin\n", mins, secs, ms);
  	}
  	DataNodeList bullets = objectsNode->getChildren("bullet");
--- 77,81 ----
  		secs=(unsigned int)((double)timepassed/1000.0);
  		mins=(unsigned int)((double)secs/60.0);
! 		Log::Write("Done Loading Map Objects, %d minutes, %d seconds, %d ms after LoadMap() begin", mins, secs, ms);
  	}
  	DataNodeList bullets = objectsNode->getChildren("bullet");
***************
*** 86,90 ****
  		secs=(unsigned int)((double)timepassed/1000.0);
  		mins=(unsigned int)((double)secs/60.0);
! 		if (LOG) printf...

[truncated message content]

Thread: [Fftrader-cvs] fftrader/src fftfile.cpp,1.1,1.2 fftfile.h,1.1,1.2 log.cpp,1.1,1.2 log.h,1.1,1.2 main

fftrader-cvs