[wpdev-commits] wolfpack console_win.cpp,1.15,1.16 gumps.cpp,1.145,1.146 npc.cpp,1.49,1.50 player.cpp,1.44,1.45 tmpeff.cpp,1.64,1.65 TmpEff.h,1.40,1.41

[<thi...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv14153

Modified Files:
	console_win.cpp gumps.cpp npc.cpp player.cpp tmpeff.cpp 
	TmpEff.h 
Log Message:
fixed some pragmas...

Fixed compile with Intel Compiler under windows.

Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** console_win.cpp	8 Oct 2003 01:37:59 -0000	1.15
--- console_win.cpp	10 Oct 2003 21:13:44 -0000	1.16
***************
*** 396,400 ****
  };
  
! int WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd )
  {
  	appInstance = hInstance;
--- 396,400 ----
  };
  
! int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd )
  {
  	appInstance = hInstance;

Index: gumps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** gumps.cpp	23 Sep 2003 23:55:21 -0000	1.145
--- gumps.cpp	10 Oct 2003 21:13:45 -0000	1.146
***************
*** 121,125 ****
  	Q_UNUSED(socket);
  	Q_UNUSED(choice);
! #pragma message("This is a good candidate for pure virtual")
  }
  
--- 121,125 ----
  	Q_UNUSED(socket);
  	Q_UNUSED(choice);
! #pragma message(__FILE__ Reminder "This is a good candidate for pure virtual")
  }
  

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** npc.cpp	23 Sep 2003 23:55:23 -0000	1.49
--- npc.cpp	10 Oct 2003 21:13:46 -0000	1.50
***************
*** 498,502 ****
  	P_ITEM pi_backpack = getBackpack();
  	
! #pragma message("Implement here tradewindow closing and disposal of it's cItem*")
  	// Close here the trade window... we still not sure how this will work, so I took out
  	//the old code
--- 498,502 ----
  	P_ITEM pi_backpack = getBackpack();
  	
! #pragma message(__FILE__ Reminder "Implement here tradewindow closing and disposal of it's cItem*")
  	// Close here the trade window... we still not sure how this will work, so I took out
  	//the old code

Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** player.cpp	23 Sep 2003 23:55:24 -0000	1.44
--- player.cpp	10 Oct 2003 21:13:46 -0000	1.45
***************
*** 493,497 ****
  	unmount();
  
! #pragma message("Implement here tradewindow closing and disposal of it's cItem*")
  	// Close here the trade window... we still not sure how this will work, so I took out
  	//the old code
--- 493,497 ----
  	unmount();
  
! #pragma message(__FILE__ Reminder "Implement here tradewindow closing and disposal of it's cItem*")
  	// Close here the trade window... we still not sure how this will work, so I took out
  	//the old code

Index: tmpeff.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/tmpeff.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** tmpeff.cpp	15 Sep 2003 12:49:05 -0000	1.64
--- tmpeff.cpp	10 Oct 2003 21:13:46 -0000	1.65
***************
*** 191,194 ****
--- 191,199 ----
  }
  
+ cTempEffects::cTempEffects()
+ {
+ 	std::make_heap( teffects.begin(), teffects.end(), cTempEffects::ComparePredicate() ); // No temp effects to start with
+ }  
+ 
  void cTempEffects::check()
  {
***************
*** 315,318 ****
--- 320,338 ----
  	}
  }
+ 
+ int cTempEffects::countSerializables()
+ {
+ 	int count = 0;
+ 
+ 	std::vector< cTempEffect* >::iterator it  = teffects.begin();
+ 	std::vector< cTempEffect* >::iterator end = teffects.end();
+ 	for ( ; it != end; ++it )
+ 	{
+ 		if( (*it)->isSerializable() )
+ 			++count;
+ 	}
+ 	return count;
+ }
+ 
  
  // cDelayedHideChar

Index: TmpEff.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/TmpEff.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** TmpEff.h	15 Sep 2003 12:49:05 -0000	1.40
--- TmpEff.h	10 Oct 2003 21:13:46 -0000	1.41
***************
*** 153,157 ****
  
  public:
! 	cTempEffects()	{ std::make_heap( teffects.begin(), teffects.end(), cTempEffects::ComparePredicate() ); }  // No temp effects to start with
  	std::vector< cTempEffect* > teffects;
  
--- 153,157 ----
  
  public:
! 	cTempEffects();
  	std::vector< cTempEffect* > teffects;
  
***************
*** 171,186 ****
  	}
  
! 	int countSerializables()
! 	{
! 		int count = 0;
! 		std::vector< cTempEffect* >::iterator it = teffects.begin();
! 		while( it != teffects.end() )
! 		{
! 			if( (*it)->isSerializable() )
! 				++count;
! 			++it;
! 		}
! 		return count;
! 	}
  };
  
--- 171,176 ----
  	}
  
! 	int countSerializables();
! 
  };