Menu
▾
▴
[Gemrb-commits] SF.net SVN: gemrb: [5124] gemrb/trunk/gemrb/plugins
|
From: <lyn...@us...> - 2008-03-16 09:42:36
|
Revision: 5124
http://gemrb.svn.sourceforge.net/gemrb/?rev=5124&view=rev
Author: lynxlupodian
Date: 2008-03-16 02:42:38 -0700 (Sun, 16 Mar 2008)
Log Message:
-----------
compilation fixes for gcc 4.3.0:
mostly warnings about empty bodies and missing includes
2x removed const for "type qualifiers ignored on function return type"
Modified Paths:
--------------
gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h
gemrb/trunk/gemrb/plugins/Core/Actions.cpp
gemrb/trunk/gemrb/plugins/Core/Actor.cpp
gemrb/trunk/gemrb/plugins/Core/Actor.h
gemrb/trunk/gemrb/plugins/Core/Cache.h
gemrb/trunk/gemrb/plugins/Core/DataFileMgr.h
gemrb/trunk/gemrb/plugins/Core/Factory.cpp
gemrb/trunk/gemrb/plugins/Core/IniSpawn.cpp
gemrb/trunk/gemrb/plugins/Core/Map.cpp
gemrb/trunk/gemrb/plugins/Core/MapControl.cpp
gemrb/trunk/gemrb/plugins/Core/MemoryStream.cpp
gemrb/trunk/gemrb/plugins/Core/PluginMgr.h
gemrb/trunk/gemrb/plugins/Core/Polygon.cpp
gemrb/trunk/gemrb/plugins/Core/Progressbar.cpp
gemrb/trunk/gemrb/plugins/Core/SaveGameIterator.cpp
gemrb/trunk/gemrb/plugins/Core/VFS.cpp
gemrb/trunk/gemrb/plugins/Core/Variables.h
gemrb/trunk/gemrb/plugins/IDSImporter/IDSImp.cpp
gemrb/trunk/gemrb/plugins/INIImporter/INIImp.cpp
gemrb/trunk/gemrb/plugins/INIImporter/INIImp.h
gemrb/trunk/gemrb/plugins/KEYImporter/Dictionary.h
Modified: gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h
===================================================================
--- gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h 2008-03-16 09:42:38 UTC (rev 5124)
@@ -22,6 +22,7 @@
#ifndef P2DAIMP_H
#define P2DAIMP_H
+#include <cstring>
#include "../Core/TableMgr.h"
#include "../../includes/globals.h"
Modified: gemrb/trunk/gemrb/plugins/Core/Actions.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Actions.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/Actions.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -3607,7 +3607,7 @@
while (i--) {
Actor *ac = game->GetPC(i,false);
if (Distance(Sender, ac)<MAX_OPERATING_DISTANCE) {
- while (MoveItemCore(ac, Sender, parameters->string0Parameter,0,IE_INV_ITEM_UNSTEALABLE)==MIC_GOTITEM);
+ while (MoveItemCore(ac, Sender, parameters->string0Parameter,0,IE_INV_ITEM_UNSTEALABLE)==MIC_GOTITEM) ;
}
}
}
@@ -3617,7 +3617,7 @@
Game *game=core->GetGame();
int i=game->GetPartySize(false);
while (i--) {
- while (MoveItemCore(game->GetPC(i,false), Sender, parameters->string0Parameter,0, IE_INV_ITEM_UNSTEALABLE)==MIC_GOTITEM);
+ while (MoveItemCore(game->GetPC(i,false), Sender, parameters->string0Parameter,0, IE_INV_ITEM_UNSTEALABLE)==MIC_GOTITEM) ;
}
}
@@ -3834,7 +3834,7 @@
int i = game->GetPartySize(false);
while (i--) {
Actor *tar = game->GetPC(i,false);
- while(MoveItemCore(Sender, tar, "",0,0)!=MIC_NOITEM);
+ while(MoveItemCore(Sender, tar, "",0,0)!=MIC_NOITEM) ;
}
}
@@ -3862,7 +3862,7 @@
}
//move all movable item from the target to the Sender
//the rest will be dropped at the feet of Sender
- while(MoveItemCore(tar, Sender, "",0,0)!=MIC_NOITEM);
+ while(MoveItemCore(tar, Sender, "",0,0)!=MIC_NOITEM) ;
}
void GameScript::MoveInventory(Scriptable *Sender, Action* parameters)
@@ -3877,7 +3877,7 @@
}
//move all movable item from the target to the Sender
//the rest will be dropped at the feet of Sender
- while(MoveItemCore(src, tar, "",0,0)!=MIC_NOITEM);
+ while(MoveItemCore(src, tar, "",0,0)!=MIC_NOITEM) ;
}
void GameScript::PickPockets(Scriptable *Sender, Action* parameters)
Modified: gemrb/trunk/gemrb/plugins/Core/Actor.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -1576,7 +1576,7 @@
if (*value==',') value++;
}
strncpy(resref, value, 8);
- for(count=0;count<8 && resref[count]!=',';count++);
+ for(count=0;count<8 && resref[count]!=',';count++) ;
resref[count]=0;
ieDword len = core->GetAudioDrv()->Play( resref );
@@ -3317,7 +3317,7 @@
if (*resource==',') resource++;
}
strncpy(Sound, resource, 8);
- for(count=0;count<8 && Sound[count]!=',';count++);
+ for(count=0;count<8 && Sound[count]!=',';count++) ;
Sound[count]=0;
}
Modified: gemrb/trunk/gemrb/plugins/Core/Actor.h
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Actor.h 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/Actor.h 2008-03-16 09:42:38 UTC (rev 5124)
@@ -27,6 +27,7 @@
#endif
#include <vector>
+#include <cstring>
#include "../../includes/ie_types.h"
#include "Animation.h"
#include "CharAnimations.h"
@@ -294,7 +295,7 @@
strncpy( LargePortrait, ResRef, 8 );
}
if(!Which) {
- for (i = 0; i < 8 && ResRef[i]; i++);
+ for (i = 0; i < 8 && ResRef[i]; i++) {};
SmallPortrait[i] = 'S';
LargePortrait[i] = 'M';
}
Modified: gemrb/trunk/gemrb/plugins/Core/Cache.h
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Cache.h 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/Cache.h 2008-03-16 09:42:38 UTC (rev 5124)
@@ -23,6 +23,7 @@
#define CACHE_H
#include <ctype.h>
+#include <cstring>
#include "../../includes/win32def.h"
#include "../../includes/globals.h"
/////////////////////////////////////////////////////////////////////////////
Modified: gemrb/trunk/gemrb/plugins/Core/DataFileMgr.h
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/DataFileMgr.h 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/DataFileMgr.h 2008-03-16 09:42:38 UTC (rev 5124)
@@ -60,9 +60,9 @@
virtual const char* GetKeyNameByIndex(const char* Tag, int index) = 0;
virtual const char* GetKeyAsString(const char* Tag, const char* Key,
const char* Default) = 0;
- virtual const int GetKeyAsInt(const char* Tag, const char* Key,
+ virtual int GetKeyAsInt(const char* Tag, const char* Key,
const int Default) = 0;
- virtual const bool GetKeyAsBool(const char* Tag, const char* Key,
+ virtual bool GetKeyAsBool(const char* Tag, const char* Key,
const bool Default) = 0;
};
Modified: gemrb/trunk/gemrb/plugins/Core/Factory.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Factory.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/Factory.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -19,6 +19,7 @@
*
*/
+#include <cstring>
#include "../../includes/win32def.h"
#include "Factory.h"
Modified: gemrb/trunk/gemrb/plugins/Core/IniSpawn.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/IniSpawn.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/IniSpawn.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -218,7 +218,7 @@
int count = core->Roll(1,CountElements(s,']'),-1);
//go to the selected spawnpoint
while(count--) {
- while(*s++!=']');
+ while(*s++!=']') ;
}
}
//parse the selected spawnpoint
Modified: gemrb/trunk/gemrb/plugins/Core/Map.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Map.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/Map.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -924,7 +924,7 @@
}
aniIterator iter;
- for(iter=animations.begin(); (iter!=animations.end()) && ((*iter)->height<anim->height); iter++);
+ for(iter=animations.begin(); (iter!=animations.end()) && ((*iter)->height<anim->height); iter++) ;
animations.insert(iter, anim);
/*
Animation *a = anim->animation[0];
@@ -1555,7 +1555,7 @@
pro->MoveTo(this,source);
pro->SetTarget(actorID);
int height = pro->GetHeight();
- for(iter=projectiles.begin();iter!=projectiles.end() && (*iter)->GetHeight()<height; iter++);
+ for(iter=projectiles.begin();iter!=projectiles.end() && (*iter)->GetHeight()<height; iter++) ;
projectiles.insert(iter, pro);
}
@@ -1567,7 +1567,7 @@
pro->MoveTo(this,source);
pro->SetTarget(dest);
int height = pro->GetHeight();
- for(iter=projectiles.begin();iter!=projectiles.end() && (*iter)->GetHeight()<height; iter++);
+ for(iter=projectiles.begin();iter!=projectiles.end() && (*iter)->GetHeight()<height; iter++) ;
projectiles.insert(iter, pro);
}
@@ -1576,7 +1576,7 @@
{
scaIterator iter;
- for(iter=vvcCells.begin();iter!=vvcCells.end() && (*iter)->ZPos<vvc->ZPos; iter++);
+ for(iter=vvcCells.begin();iter!=vvcCells.end() && (*iter)->ZPos<vvc->ZPos; iter++) ;
vvcCells.insert(iter, vvc);
}
@@ -2675,7 +2675,7 @@
spaIterator iter;
//this is pos.y we just set
//int h = sparkles->GetHeight();
- for(iter=particles.begin(); (iter!=particles.end()) && ((*iter)->GetHeight()<pos.y); iter++);
+ for(iter=particles.begin(); (iter!=particles.end()) && ((*iter)->GetHeight()<pos.y); iter++) ;
particles.insert(iter, sparkles);
}
Modified: gemrb/trunk/gemrb/plugins/Core/MapControl.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/MapControl.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/MapControl.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -35,7 +35,7 @@
static int MAP_DIV = 3;
static int MAP_MULT = 32;
-typedef enum colorcode {black=0, gray, violet, green, orange, red, blue, darkblue, darkgreen};
+typedef enum {black=0, gray, violet, green, orange, red, blue, darkblue, darkgreen} colorcode;
Color colors[]={
{ 0x00, 0x00, 0x00, 0xff }, //black
Modified: gemrb/trunk/gemrb/plugins/Core/MemoryStream.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/MemoryStream.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/MemoryStream.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -21,6 +21,7 @@
#include "../../includes/win32def.h"
#include "MemoryStream.h"
+#include <cstring>
MemoryStream::MemoryStream(void* buffer, int length, bool autoFree)
{
Modified: gemrb/trunk/gemrb/plugins/Core/PluginMgr.h
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/PluginMgr.h 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/PluginMgr.h 2008-03-16 09:42:38 UTC (rev 5124)
@@ -31,6 +31,7 @@
#include "../../includes/win32def.h"
#include "../../includes/globals.h"
#include <vector>
+#include <cstring>
#ifdef WIN32
Modified: gemrb/trunk/gemrb/plugins/Core/Polygon.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Polygon.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/Polygon.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -23,6 +23,7 @@
#include <algorithm>
#include <vector>
+#include <cstring>
Gem_Polygon::Gem_Polygon(Point* points, unsigned int cnt, Region *bbox)
{
Modified: gemrb/trunk/gemrb/plugins/Core/Progressbar.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Progressbar.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/Progressbar.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -19,6 +19,7 @@
*
*/
+#include <cstring>
#include "../../includes/win32def.h"
#include "Progressbar.h"
#include "Interface.h"
Modified: gemrb/trunk/gemrb/plugins/Core/SaveGameIterator.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/SaveGameIterator.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/SaveGameIterator.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -246,7 +246,7 @@
if (IsSaveGameSlot( Path, de->d_name )) {
charlist::iterator i;
- for (i=save_slots.begin(); i!=save_slots.end() && stricmp((*i), de->d_name)<0; i++);
+ for (i=save_slots.begin(); i!=save_slots.end() && stricmp((*i), de->d_name)<0; i++) ;
save_slots.insert( i, strdup( de->d_name ) );
}
} while (( de = readdir( dir ) ) != NULL);
@@ -341,7 +341,7 @@
int tmp = IsQuickSaveSlot(folder, (*m) );
if (tmp) {
size_t pos = myslots.size();
- while(pos-- && myslots[pos]>tmp);
+ while(pos-- && myslots[pos]>tmp) ;
myslots.insert(myslots.begin()+pos+1,tmp);
}
}
Modified: gemrb/trunk/gemrb/plugins/Core/VFS.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/VFS.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/VFS.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -24,11 +24,11 @@
#include <stdarg.h>
#include <sys/stat.h>
+#include <cstring>
#include "../../includes/globals.h"
#include "VFS.h"
#include "Interface.h"
-
#ifdef WIN32
// buffer which readdir returns
Modified: gemrb/trunk/gemrb/plugins/Core/Variables.h
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Variables.h 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/Core/Variables.h 2008-03-16 09:42:38 UTC (rev 5124)
@@ -23,6 +23,7 @@
#define VARIABLES_H
#include <ctype.h>
+#include <cstring>
#include "../../includes/win32def.h"
#include "../../includes/globals.h"
#include "../../includes/SClassID.h"
Modified: gemrb/trunk/gemrb/plugins/IDSImporter/IDSImp.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/IDSImporter/IDSImp.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/IDSImporter/IDSImp.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -24,6 +24,7 @@
#include "IDSImp.h"
#include "IDSImpDefs.h"
#include <ctype.h>
+#include <cstring>
IDSImp::IDSImp(void)
{
Modified: gemrb/trunk/gemrb/plugins/INIImporter/INIImp.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/INIImporter/INIImp.cpp 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/INIImporter/INIImp.cpp 2008-03-16 09:42:38 UTC (rev 5124)
@@ -121,7 +121,7 @@
return Default;
}
-const int INIImp::GetKeyAsInt(const char* Tag, const char* Key,
+int INIImp::GetKeyAsInt(const char* Tag, const char* Key,
const int Default)
{
for (unsigned int i = 0; i < tags.size(); i++) {
@@ -133,7 +133,7 @@
return Default;
}
-const bool INIImp::GetKeyAsBool(const char* Tag, const char* Key,
+bool INIImp::GetKeyAsBool(const char* Tag, const char* Key,
const bool Default)
{
for (unsigned int i = 0; i < tags.size(); i++) {
Modified: gemrb/trunk/gemrb/plugins/INIImporter/INIImp.h
===================================================================
--- gemrb/trunk/gemrb/plugins/INIImporter/INIImp.h 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/INIImporter/INIImp.h 2008-03-16 09:42:38 UTC (rev 5124)
@@ -22,6 +22,7 @@
#ifndef INIIMP_H
#define INIIMP_H
+#include <cstring>
#include "../Core/DataFileMgr.h"
#include "../../includes/globals.h"
@@ -124,7 +125,7 @@
return Default;
}
- const int GetKeyAsInt(const char* Key, const int Default)
+ int GetKeyAsInt(const char* Key, const int Default)
{
const char* ret = NULL;
for (unsigned int i = 0; i < pairs.size(); i++) {
@@ -139,7 +140,7 @@
return atoi( ret );
}
- const bool GetKeyAsBool(const char* Key, const bool Default)
+ bool GetKeyAsBool(const char* Key, const bool Default)
{
const char* ret = NULL;
for (unsigned int i = 0; i < pairs.size(); i++) {
@@ -184,9 +185,9 @@
const char* GetKeyNameByIndex(const char* Tag, int index);
const char* GetKeyAsString(const char* Tag, const char* Key,
const char* Default);
- const int GetKeyAsInt(const char* Tag, const char* Key,
+ int GetKeyAsInt(const char* Tag, const char* Key,
const int Default);
- const bool GetKeyAsBool(const char* Tag, const char* Key,
+ bool GetKeyAsBool(const char* Tag, const char* Key,
const bool Default);
public:
void release(void)
Modified: gemrb/trunk/gemrb/plugins/KEYImporter/Dictionary.h
===================================================================
--- gemrb/trunk/gemrb/plugins/KEYImporter/Dictionary.h 2008-03-16 01:30:39 UTC (rev 5123)
+++ gemrb/trunk/gemrb/plugins/KEYImporter/Dictionary.h 2008-03-16 09:42:38 UTC (rev 5124)
@@ -23,6 +23,7 @@
#define DICTIONARY_H
#include <ctype.h>
+#include <cstring>
#include "../../includes/win32def.h"
#include "../../includes/SClassID.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|