diff -urN vegastrike-0.4.3.orig/src/cmd/ai/hard_coded_scripts.cpp vegastrike-0.4.3/src/cmd/ai/hard_coded_scripts.cpp
--- vegastrike-0.4.3.orig/src/cmd/ai/hard_coded_scripts.cpp 2004-12-18 17:32:47.000000000 +0900
+++ vegastrike-0.4.3/src/cmd/ai/hard_coded_scripts.cpp 2005-08-17 01:36:42.000000000 +0900
@@ -260,12 +260,12 @@
};
}
void LoopAround(Order* aisc, Unit * un) {
- Order* broll = new Orders::LoopAround(false,true,false,(int)un);
+ Order* broll = new Orders::LoopAround(false,true,false,(long)un);
AddOrd(aisc,un,broll);
}
void AggressiveLoopAround(Order* aisc, Unit * un) {
- Order* broll = new Orders::LoopAround(true,true,false,(int)un);
+ Order* broll = new Orders::LoopAround(true,true,false,(long)un);
AddOrd(aisc,un,broll);
}
@@ -278,22 +278,22 @@
AddOrd(un->aistate,un,new ExecuteFor(new Orders::MatchRoll(-un->GetComputerData().max_roll_left,false),1.0f));
}
void LoopAroundFast(Order* aisc, Unit * un) {
- Order* broll = new Orders::LoopAround(false,true,true,(int)un);
+ Order* broll = new Orders::LoopAround(false,true,true,(long)un);
AddOrd(aisc,un,broll);
}
void AggressiveLoopAroundFast(Order* aisc, Unit * un) {
- Order* broll = new Orders::LoopAround(true,true,true,(int)un);
+ Order* broll = new Orders::LoopAround(true,true,true,(long)un);
AddOrd(aisc,un,broll);
}
void LoopAroundSlow(Order* aisc, Unit * un) {
- Order* broll = new Orders::LoopAround(false,false,false,(int)un);
+ Order* broll = new Orders::LoopAround(false,false,false,(long)un);
AddOrd(aisc,un,broll);
}
void AggressiveLoopAroundSlow(Order* aisc, Unit * un) {
- Order* broll = new Orders::LoopAround(true,false,false,(int)un);
+ Order* broll = new Orders::LoopAround(true,false,false,(long)un);
AddOrd(aisc,un,broll);
}
diff -urN vegastrike-0.4.3.orig/src/cmd/music.cpp vegastrike-0.4.3/src/cmd/music.cpp
--- vegastrike-0.4.3.orig/src/cmd/music.cpp 2005-08-17 01:35:24.000000000 +0900
+++ vegastrike-0.4.3/src/cmd/music.cpp 2005-08-17 01:36:51.000000000 +0900
@@ -205,7 +205,7 @@
int Music::SelectTracks(void) {
static bool random=XMLSupport::parse_bool(vs_config->getVariable("audio","shuffle_songs","true"));
- if ((BaseInterface::CurrentBase||loopsleft>0)&&lastlist < (int)playlist.size()&&lastlist>=0) {
+ if ((BaseInterface::CurrentBase||loopsleft>0)&&lastlist < (long)playlist.size()&&lastlist>=0) {
if (loopsleft>0) {
loopsleft--;
}
@@ -259,7 +259,7 @@
if (!playlist[BATTLELIST].empty()) {
tmp=randInt((playlist[BATTLELIST].size()));
}
- return (int)tmp;
+ return (long)tmp;
}
volatile int moredata=0;
#ifndef _WIN32
@@ -274,7 +274,7 @@
void *
#endif
input) {
- int socketr = (int)input;
+ int socketr = (long)input;
while(1) {
printf ("Reading from socket %d\n",socketr);
char data=fNET_fgetc(socketr);
@@ -333,7 +333,7 @@
void Music::GotoSong (int whichlist,int whichsong,bool skip) {
if (g_game.music_enabled) {
- if (whichsong!=NOLIST&&whichlist!=NOLIST&&whichlist<(int)playlist.size()&&whichsong<(int)playlist[whichlist].size()) {
+ if (whichsong!=NOLIST&&whichlist!=NOLIST&&whichlist<(long)playlist.size()&&whichsong<(long)playlist[whichlist].size()) {
GotoSong(playlist[whichlist][whichsong]);
} else {
SkipRandList();
@@ -343,7 +343,7 @@
void Music::SkipRandSong(int whichlist) {
if (this!=NULL) {
- if (whichlist!=NOLIST&&whichlist>=0&&whichlist<(int)playlist.size()){
+ if (whichlist!=NOLIST&&whichlist>=0&&whichlist<(long)playlist.size()){
lastlist = whichlist;
static bool random=XMLSupport::parse_bool(vs_config->getVariable("audio","shuffle_songs","true"));
if (playlist[whichlist].size()) {
diff -urN vegastrike-0.4.3.orig/src/cmd/script/pythonmission.cpp vegastrike-0.4.3/src/cmd/script/pythonmission.cpp
--- vegastrike-0.4.3.orig/src/cmd/script/pythonmission.cpp 2004-04-25 09:39:13.000000000 +0900
+++ vegastrike-0.4.3/src/cmd/script/pythonmission.cpp 2005-08-17 01:36:47.000000000 +0900
@@ -16,7 +16,7 @@
delete this;
}
PythonMissionBaseClass::~PythonMissionBaseClass(){
- VSFileSystem::vs_fprintf (stderr,"BASE Destruct called. If called from C++ this is death %ld (0x%x)",(unsigned long)this,(unsigned int)this);
+ VSFileSystem::vs_fprintf (stderr,"BASE Destruct called. If called from C++ this is death %ld (0x%lx)",(unsigned long)this,(unsigned long)this);
}
void PythonMissionBaseClass::Execute () {
diff -urN vegastrike-0.4.3.orig/src/cmd/unit_generic.cpp vegastrike-0.4.3/src/cmd/unit_generic.cpp
--- vegastrike-0.4.3.orig/src/cmd/unit_generic.cpp 2005-02-10 13:18:56.000000000 +0900
+++ vegastrike-0.4.3/src/cmd/unit_generic.cpp 2005-08-17 01:36:49.000000000 +0900
@@ -119,7 +119,7 @@
}
diff = fmod (diff,tmpflicker);
//we know counter is somewhere between 0 and damage level
- unsigned int thus = ((int)un)>>2;//cast this to an int for fun!
+ unsigned int thus = ((long)un)>>2;//cast this to an int for fun! (this doesn't work for 64-bit machines)
thus = thus % ((unsigned int)tmpflicker);
diff = fmod (diff+thus,tmpflicker);
if (flickerofftime>diff) {
diff -urN vegastrike-0.4.3.orig/src/gui/eventmanager.cpp vegastrike-0.4.3/src/gui/eventmanager.cpp
--- vegastrike-0.4.3.orig/src/gui/eventmanager.cpp 2004-12-17 19:10:41.000000000 +0900
+++ vegastrike-0.4.3/src/gui/eventmanager.cpp 2005-08-17 01:36:52.000000000 +0900
@@ -61,7 +61,7 @@
if (controlToDelete == NULL || find(deleteQueue.begin(), deleteQueue.end(), controlToDelete)!=deleteQueue.end()) {
bool DUPLICATE_DELETE_OF_OBJECT = true;
char tempstr[254];
- sprintf(tempstr, "\nERROR: duplicate delete of object %X.\n\n", (int)controlToDelete);
+ sprintf(tempstr, "\nERROR: duplicate delete of object %lX.\n\n", (long)controlToDelete);
fputs(tempstr, stderr);
#if defined (_MSC_VER) && defined(_DEBUG) && 0
if (DEBUG_ERROR_IN_MY_CODE) {
--- vegastrike-0.4.3/launcher/saveinterface.cpp~ 2006-02-10 10:54:30.000000000 +0100
+++ vegastrike-0.4.3/launcher/saveinterface.cpp 2006-02-10 11:11:33.000000000 +0100
@@ -213,7 +213,7 @@
#ifdef _WIN32
GoToParentDir();
#endif
- unsigned int player = my_mission.rfind ("player");
+ std::string::size_type player = my_mission.rfind ("player");
if (player>0&&player!=std::string::npos) {
char num [4]={'-','m',(*(my_mission.begin()+(player-1))),'\0'};
printf ("vegastrike %s %s",num,my_mission.c_str());
@@ -298,7 +298,7 @@
}
void hello( GtkWidget *widget, gpointer data ) {
- int i=(int)data;
+ int i=GPOINTER_TO_INT(data);
int pid=0;
switch (i) {
case 5: