[Exult-cvs-logs] exult/gumps File_gump.cc,1.23,1.24 Newfile_gump.cc,1.36,1.37 Text_gump.cc,1.12,1.13

[<col...@us...>]

Update of /cvsroot/exult/exult/gumps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30280/gumps

Modified Files:
	File_gump.cc Newfile_gump.cc Text_gump.cc 
Log Message:
	* various files: Some minor extremely changes that to compile for 
	  PocketPC

Index: File_gump.cc
===================================================================
RCS file: /cvsroot/exult/exult/gumps/File_gump.cc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- File_gump.cc	31 Aug 2003 17:32:25 -0000	1.23
+++ File_gump.cc	21 May 2004 16:57:15 -0000	1.24
@@ -36,12 +36,14 @@
 #include "mouse.h"
 #include "Yesno_gump.h"
 
+#ifndef UNDER_CE
 using std::cout;
 using std::endl;
 using std::memmove;
 using std::string;
 using std::strlen;
 using std::strncpy;
+#endif
 
 /*
  *	Statics:

Index: Newfile_gump.cc
===================================================================
RCS file: /cvsroot/exult/exult/gumps/Newfile_gump.cc,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Newfile_gump.cc	31 Aug 2003 17:32:25 -0000	1.36
+++ Newfile_gump.cc	21 May 2004 16:57:15 -0000	1.37
@@ -42,6 +42,7 @@
 #include "party.h"
 #include "Text_button.h"
 
+#ifndef UNDER_CE
 using std::atoi;
 using std::cout;
 using std::endl;
@@ -57,6 +58,7 @@
 using std::strcat;
 using std::time_t;
 using std::tm;
+#endif
 
 /*
  *	Macros:
@@ -123,6 +125,91 @@
 static const char *deletetext = "DELETE";
 static const char *canceltext = "CANCEL";
 
+#ifdef UNDER_CE
+struct tm * __cdecl localtime(const time_t *it)
+{
+	static tm	t;
+	memset(&t,0,sizeof(t));
+
+	SYSTEMTIME systime;
+	FILETIME filetime;
+	FILETIME local_filetime;
+	LONGLONG time;
+
+	SYSTEMTIME systime_1970;
+	FILETIME filetime_1970;
+	LONGLONG time_1970;
+
+	systime_1970.wYear = 1970;
+	systime_1970.wMonth = 1;
+	systime_1970.wDay = 1;
+	systime_1970.wHour = 0;
+	systime_1970.wMinute = 0;
+	systime_1970.wSecond = 0;
+	systime_1970.wMilliseconds = 0;
+	SystemTimeToFileTime(&systime_1970, &filetime_1970);
+	memcpy(&time_1970, &filetime_1970, 8);
+
+	// Seconds to 100 nanoseconds
+	time = *it;
+	time *= 10000000;
+	time += time_1970;
+
+	memcpy(&filetime, &time, 8);
+	FileTimeToLocalFileTime(&filetime, &local_filetime);
+	FileTimeToSystemTime(&local_filetime, &systime);
+
+	t.tm_sec = systime.wSecond;
+	t.tm_min = systime.wMinute;
+	t.tm_hour = systime.wHour;
+	t.tm_isdst = 0;
+	t.tm_wday = systime.wDayOfWeek;
+	t.tm_mday = systime.wDay;
+	t.tm_mon = systime.wMonth - 1;
+	t.tm_yday = 0;
+	t.tm_year = systime.wYear - 1900;
+
+	return &t;
+}
+
+time_t __cdecl time(time_t *t)
+{
+	SYSTEMTIME systime;
+	FILETIME filetime;
+	LONGLONG time;
+
+	SYSTEMTIME systime_1970;
+	FILETIME filetime_1970;
+	LONGLONG time_1970;
+
+	GetSystemTime(&systime);
+	SystemTimeToFileTime(&systime, &filetime);
+	memcpy(&time, &filetime, 8);
+
+	systime_1970.wYear = 1970;
+	systime_1970.wMonth = 1;
+	systime_1970.wDay = 1;
+	systime_1970.wHour = 0;
+	systime_1970.wMinute = 0;
+	systime_1970.wSecond = 0;
+	systime_1970.wMilliseconds = 0;
+	SystemTimeToFileTime(&systime_1970, &filetime_1970);
+	memcpy(&time_1970, &filetime_1970, 8);
+
+	// Time since Jan First 1970
+	time -= time_1970;
+	if (time < 0) time = 0;
+
+	// 100 nanoseconds to Seconds
+	time /= 10000000;
+
+	if (t) *t = time;
+
+	return time;
+}
+#endif
+
+
 /*
  *	One of our buttons.
  */

Index: Text_gump.cc
===================================================================
RCS file: /cvsroot/exult/exult/gumps/Text_gump.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Text_gump.cc	27 Jun 2002 23:06:56 -0000	1.12
+++ Text_gump.cc	21 May 2004 16:57:15 -0000	1.13
@@ -27,9 +27,11 @@
 #include "gamewin.h"
 #include "Text_gump.h"
 
+#ifndef UNDER_CE
 using std::strchr;
 using std::strcpy;
 using std::strlen;
+#endif
 
 /*
  *	Add to the text, starting a newline.