Revision: 1564
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1564&view=rev
Author: rorthomas
Date: 2011-01-15 22:00:50 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
fixed several component precompiler issues
fixed some code warnings
removed trailing spaces
updated some things relevant for new MyGUI version
added resource path development ability
removed pstdint - too much warnings - need to verify under linux
Modified Paths:
--------------
trunk/source/main/BeamForcesEuler.cpp
trunk/source/main/BeamStats.cpp
trunk/source/main/CMakeLists.txt
trunk/source/main/RigsOfRods.cpp
trunk/source/main/RoRFrameListener.cpp
trunk/source/main/SoundManager.cpp
trunk/source/main/angelscript/scripthelper/scripthelper.cpp
trunk/source/main/angelscript/scripthelper/scripthelper.h
trunk/source/main/angelscript/scriptmath/scriptmath.cpp
trunk/source/main/angelscript/scriptmath/scriptmath.h
trunk/source/main/angelscript/scriptmath3d/scriptmath3d.cpp
trunk/source/main/angelscript/scriptmath3d/scriptmath3d.h
trunk/source/main/angelscript/scriptstdstring/scriptstdstring.cpp
trunk/source/main/angelscript/scriptstdstring/scriptstdstring.h
trunk/source/main/gui_manager.cpp
trunk/source/main/gui_manager.h
trunk/source/main/sha1.h
Modified: trunk/source/main/BeamForcesEuler.cpp
===================================================================
--- trunk/source/main/BeamForcesEuler.cpp 2010-12-30 00:58:41 UTC (rev
1563)
+++ trunk/source/main/BeamForcesEuler.cpp 2011-01-15 22:00:50 UTC (rev
1564)
@@ -1,4 +1,3 @@
-
#include "Beam.h"
#include "engine.h"
@@ -13,8 +12,6 @@
extern float mrtime;
-
-
void Beam::calcForcesEuler(int doUpdate, Real dt, int step, int maxstep,
Beam** trucks, int numtrucks)
{
// do not calc anything if we are going to get deleted
@@ -41,7 +38,6 @@
}
// if (doUpdate) mWindow->setDebugText(engine->status);
-
BES_START(BES_CORE_Beams);
//springs
@@ -143,7 +139,6 @@
beams[i].stress=flen;
flen=fabs(flen);
-
// Fast test for deformation
if (flen > beams[i].minmaxposnegstress)
{
@@ -153,7 +148,6 @@
// For compression
if (sflen>beams[i].maxposstress &&
difftoBeamL<0.0f)
{
-
increased_accuracy=1;
Real
yield_length=beams[i].maxposstress/k;
Real
deform=difftoBeamL+yield_length*(1.0f-beams[i].plastic_coef);
@@ -238,7 +232,6 @@
{
LogManager::getSingleton().logMessage(" XXX Beam " +
StringConverter::toString(i) + " just broke with force " +
StringConverter::toString(flen) + " / " +
StringConverter::toString(beams[i].strength) + ". It was between nodes " +
StringConverter::toString(beams[i].p1->id) + " and " +
StringConverter::toString(beams[i].p2->id) + ".");
}
-
} else
beams[i].strength=2.0f*beams[i].minmaxposnegstress;
//something broke, check buoyant hull
@@ -368,7 +361,6 @@
props[propi].rotaZ +=
cstate;
limiter =
props[propi].rotaZ;
}
-
} else
{
if
(props[propi].animMode[animnum] & ANIM_MODE_ROTA_X) rx += cstate;
@@ -541,7 +533,6 @@
props[propi].orgoffsetZ
= autooffset;
}
}
-
}
animnum++;
}
@@ -624,7 +615,6 @@
rigidifiers[i].lastalpha=alphap;
}
-
BES_STOP(BES_CORE_Rigidifiers);
BES_START(BES_CORE_Hooks);
@@ -647,7 +637,6 @@
}
}
-
//locks - this is not active in network mode
for(std::vector<hook_t>::iterator it=hooks.begin(); it!=hooks.end();
it++)
{
@@ -706,7 +695,6 @@
nodes[mousenode].Forces += mousemoveforce * dir;
}
-
// START Slidenode section
/////////////////////////////////////////////////
// these must be done before the integrator, or else the forces are not
calculated properly
BES_START(BES_CORE_SlideNodes);
@@ -714,7 +702,6 @@
BES_STOP(BES_CORE_SlideNodes);
// END Slidenode section
/////////////////////////////////////////////////
-
BES_START(BES_CORE_Nodes);
float tminx=nodes[0].AbsPosition.x;
@@ -752,14 +739,12 @@
nodes[i].colltesttimer+=dt;
if (nodes[i].contacted || nodes[i].colltesttimer>0.005
|| (nodes[i].iswheel && nodes[i].colltesttimer>0.0025) || increased_accuracy )
{
+ int contacted=0;
float ns=0;
ground_model_t *gm = 0; // this is used as
result storage, so we can use it later on
- int contacted =
collisions->groundCollision(&nodes[i], nodes[i].colltesttimer, &gm, &ns);
-
int handlernum = -1;
- //Tlooks like this needs to remain a binary
operator otherwise the terrain material appears to be wrong
- if ( contacted |
- collisions->nodeCollision(&nodes[i],
i==cinecameranodepos[currentcamera], contacted, nodes[i].colltesttimer, &ns,
&gm, &handlernum))
+ // reverted this construct to the old form,
don't mess with it, the binary operator is intentionally!
+ if
((contacted=collisions->groundCollision(&nodes[i], nodes[i].colltesttimer, &gm,
&ns)) | collisions->nodeCollision(&nodes[i],
i==cinecameranodepos[currentcamera], contacted, nodes[i].colltesttimer, &ns,
&gm, &handlernum))
{
//FX
if (gm && doUpdate && dustp)
@@ -813,7 +798,6 @@
}
}
-
// record g forces on cameras
if (i==cameranodepos[0])
{
@@ -855,7 +839,6 @@
{
//fasttrack drag
nodes[i].Forces+=nodes[i].lastdrag;
-
} else
{
Real
speed=nodes[i].Velocity.squaredLength();//we will (not) reuse this
@@ -1034,7 +1017,6 @@
{
nodes[i].Forces+=nodes[i].buoyanceForce;
}
-
}
BES_STOP(BES_CORE_Buoyance);
@@ -1071,7 +1053,6 @@
}
}
-
// new-style Axles
// loop through all axles for interaxle torque, this is the torsion to
keep
// the axles aligned with each other as if they connected by a shaft
@@ -1291,7 +1272,6 @@
else if (ssm)
ssm->trigStop(trucknum, SS_TRIG_AIR);
#endif //OPENAL
-
}
BES_STOP(BES_CORE_Shocks);
@@ -1418,7 +1398,6 @@
BES_STOP(BES_CORE_Hydros);
BES_START(BES_CORE_Commands);
-
// forward things to trailers
if (state==ACTIVATED && forwardcommands)
{
@@ -1478,7 +1457,6 @@
if(commandkey[i].commandValue >= 0.5)
beams[abs(commandkey[i].beams[j])].autoMoveLock=true;
-
// only process ties if there is enough force available
if(canwork)
{
@@ -1754,7 +1732,6 @@
}
if(requestpower)
requested++;
-
}
if (engine)
@@ -1812,7 +1789,6 @@
nodes[rotators[i].nodes2[k+2]].Forces+=(aerror*ref2len*rigidity)*dir2;
}
}
-
}
BES_STOP(BES_CORE_Commands);
@@ -1845,5 +1821,4 @@
BES_STOP(BES_CORE_Replay);
BES_STOP(BES_CORE_WholeTruckCalc);
-
-}
+}
\ No newline at end of file
Modified: trunk/source/main/BeamStats.cpp
===================================================================
--- trunk/source/main/BeamStats.cpp 2010-12-30 00:58:41 UTC (rev 1563)
+++ trunk/source/main/BeamStats.cpp 2011-01-15 22:00:50 UTC (rev 1564)
@@ -6,7 +6,7 @@
For more information, see http://www.rigsofrods.com/
Rigs of Rods is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 3, as
+it under the terms of the GNU General Public License version 3, as
published by the Free Software Foundation.
Rigs of Rods is distributed in the hope that it will be useful,
@@ -66,7 +66,6 @@
typeDescriptions[BES_CORE_Replay] = "Replay";
typeDescriptions[BES_CORE_Skidmarks] = "Skidmarks";
-
typeDescriptions_gfx[BES_GFX_UpdateSkeleton] =
"UpdateSkeleton";
typeDescriptions_gfx[BES_GFX_ScaleTruck] = "ScaleTruck";
typeDescriptions_gfx[BES_GFX_checkBeamMaterial] =
"checkBeamMaterial";
@@ -136,7 +135,7 @@
return true;
updateTimeGUI = 0;
-
+
if(statClients.size() == 0)
return true;
@@ -149,7 +148,7 @@
char tmp_gfx[1024]="";
char line[1024]="";
- for(int c = 0; c < statClients.size(); c++)
+ for(unsigned int c = 0; c < statClients.size(); c++)
{
//if(it->first != current_truck || trucks[it->first]->state ==
SLEEPING)
if(trucks[statClients[c].trucknum]->state == SLEEPING)
@@ -166,12 +165,12 @@
sprintf(line, "%-46s | %-46s\n", "============== PHYSICS
==============", "================ GFX ================");
msg += String(line);
-
+
sum = core->getTiming(BES_CORE_WholeTruckCalc);
sum_gfx = core->getTiming(BES_CORE_WholeTruckCalc);
if(sum==0)
continue;
-
+
sprintf(tmp, " %20s: % 10.4f%% : %1.6fs", "Whole truck",
100.0f, sum);
sprintf(tmp_gfx, " %20s: % 10.4f%% : %1.6fs", "FrameTime",
100.0f, sum_gfx);
sprintf(line, "%-46s | %-46s\n", tmp, tmp_gfx);
@@ -203,7 +202,6 @@
if(!addLine) break;
sprintf(line, "%-46s | %-46s\n", tmp, tmp_gfx);
msg += String(line);
-
}
// find out the rest time
{
@@ -222,12 +220,11 @@
return true;
}
-
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
BeamThreadStats::BeamThreadStats(int _type) : stype(_type)
{
- for (int i=0; i<MAX_TIMINGS; i++)
+ for (int i=0; i<MAX_TIMINGS; i++)
{
timings[i]=0;
savedTimings[i]=0;
@@ -254,7 +251,6 @@
framecounter++;
}
-
void BeamThreadStats::queryStart(int type)
{
timings_start[type] = new PrecisionTimer();
@@ -265,7 +261,7 @@
if(!timings_start[type]) return;
timings[type] += (timings_start[type]->elapsed());
-
+
if(stype == BES_CORE && type == BES_CORE_WholeTruckCalc)
{
// secure timings
@@ -294,6 +290,4 @@
return savedTimings[type];
}
-
-#endif //FEAT_TIMING
-
+#endif //FEAT_TIMING
\ No newline at end of file
Modified: trunk/source/main/CMakeLists.txt
===================================================================
--- trunk/source/main/CMakeLists.txt 2010-12-30 00:58:41 UTC (rev 1563)
+++ trunk/source/main/CMakeLists.txt 2011-01-15 22:00:50 UTC (rev 1564)
@@ -80,6 +80,12 @@
add_definitions("-DBOOST_ALL_NO_LIB")
add_definitions("-DUSE_RTSHADER_SYSTEM")
-add_executable(RoR WIN32 ${HEADER_FILES} ${SOURCE_FILES})
+IF(WIN32)
+ add_executable(RoR WIN32 ${HEADER_FILES} ${SOURCE_FILES})
+ELSE(WIN32)
+ add_executable(RoR ${HEADER_FILES} ${SOURCE_FILES})
+ENDIF(WIN32)
+
+
target_link_libraries(RoR ${Ogre_LIBRARIES} ${Ogre_Terrain_LIBRARIES}
${Ogre_Paging_LIBRARIES} ${Ogre_RTShader_LIBRARIES} ${Ois_LIBRARIES} ${OS_LIBS}
${optional_libs})
Modified: trunk/source/main/RigsOfRods.cpp
===================================================================
--- trunk/source/main/RigsOfRods.cpp 2010-12-30 00:58:41 UTC (rev 1563)
+++ trunk/source/main/RigsOfRods.cpp 2011-01-15 22:00:50 UTC (rev 1564)
@@ -39,10 +39,10 @@
mShaderGenerator = pShaderGenerator;
}
- virtual Technique* handleSchemeNotFound(unsigned short schemeIndex,
- const String& schemeName, Material* originalMaterial, unsigned
short lodIndex,
+ virtual Technique* handleSchemeNotFound(unsigned short schemeIndex,
+ const String& schemeName, Material* originalMaterial, unsigned
short lodIndex,
const Renderable* rend)
- {
+ {
// Case this is the default shader generator scheme.
if (schemeName ==
RTShader::ShaderGenerator::DEFAULT_SCHEME_NAME)
{
@@ -53,9 +53,9 @@
if (itFind == mRegisteredMaterials.end())
{
techniqueCreated =
mShaderGenerator->createShaderBasedTechnique(
- originalMaterial->getName(),
- MaterialManager::DEFAULT_SCHEME_NAME,
- schemeName);
+ originalMaterial->getName(),
+ MaterialManager::DEFAULT_SCHEME_NAME,
+ schemeName);
}
mRegisteredMaterials[originalMaterial] =
techniqueCreated;
}
@@ -67,13 +67,11 @@
typedef std::map<Material*, bool> MaterialRegisterMap;
typedef MaterialRegisterMap::iterator MaterialRegisterIterator;
-
protected:
MaterialRegisterMap mRegisteredMaterials;
// Registered material map.
RTShader::ShaderGenerator* mShaderGenerator;
// The shader generator instance.
};
-
RigsOfRods::RigsOfRods(Ogre::String name, unsigned int hwnd) :
mRoot(0),
mCamera(0),
@@ -100,7 +98,7 @@
{
mRoot->shutdown();
// XXX : commented out code below crashes
- //
+ //
//if(mRoot)
// delete mRoot;
} catch(Ogre::Exception& e)
@@ -127,7 +125,12 @@
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
dirsep="\\";
#endif
-
ResourceGroupManager::getSingleton().addResourceLocation(SETTINGS.getSetting("Resources
Path")+name+".zip", "Zip", group, true);
+
+
ResourceGroupManager::getSingleton().addResourceLocation(SETTINGS.getSetting("Resources
Path")+dirsep+name, "FileSystem", group, true);
+ try
+ {
+
ResourceGroupManager::getSingleton().addResourceLocation(SETTINGS.getSetting("Resources
Path")+name+".zip", "Zip", group, true);
+ } catch(...) {}
}
bool RigsOfRods::setup(void)
@@ -136,7 +139,7 @@
//note: we don't have LogManager available yet!
//FIRST: Get the "program path" and the user space path
- // note: this is now done in the settigns class, so set it up
+ // note: this is now done in the settings class, so set it up
// note: you need to set the buildmode correcty before you build the
paths!
SETTINGS.setSetting("BuildMode", buildmode?"Yes":"No");
if(!SETTINGS.setupPaths())
@@ -199,7 +202,7 @@
// optional ones
if (SETTINGS.getSetting("3D Sound renderer") != "No sound")
loadMainResource("sounds");
-
+
if (SETTINGS.getSetting("Sky effects") == "Caelum (best looking,
slower)")
loadMainResource("caelum");
@@ -220,7 +223,7 @@
if(SETTINGS.getSetting("Motion blur") == "Yes")
loadMainResource("blur");
-
+
if(SETTINGS.getSetting("HeatHaze") == "Yes")
loadMainResource("heathaze");
@@ -229,7 +232,7 @@
if (SETTINGS.getSetting("Shadow technique")=="Parallel-split Shadow
Maps")
loadMainResource("pssm");
-
+
//streams path, to be processed later by the cache system
LogManager::getSingleton().logMessage("Loading filesystems");
@@ -252,7 +255,6 @@
// add scripts folder
ResourceGroupManager::getSingleton().addResourceLocation(SETTINGS.getSetting("User
Path")+"scripts", "FileSystem", "Scripts", true);
-
// init skin manager, important to happen before trucks resource
loading!
LogManager::getSingleton().logMessage("registering Skin Manager");
new SkinManager();
@@ -303,7 +305,6 @@
vp = mWindow->addViewport(mCamera);
vp->setBackgroundColour(ColourValue(0,0,0));
-
// Set default mipmap level (NB some APIs ignore this)
TextureManager::getSingleton().setDefaultNumMipmaps(5);
//mRoot->setFrameSmoothingPeriod(2.0);
@@ -373,14 +374,13 @@
// Set the scene manager.
mShaderGenerator->addSceneManager(mSceneMgr);
-
// Add the shader libs resource location.
loadMainResource("rtshader");
// Set shader cache path.
mShaderGenerator->setShaderCachePath(SETTINGS.getSetting("User
Path")+"cache");
- ShaderGeneratorTechniqueResolverListener *mMaterialMgrListener = new
ShaderGeneratorTechniqueResolverListener(mShaderGenerator);
+ ShaderGeneratorTechniqueResolverListener *mMaterialMgrListener = new
ShaderGeneratorTechniqueResolverListener(mShaderGenerator);
MaterialManager::getSingleton().addListener(mMaterialMgrListener);
// add per pixel lighting
@@ -416,7 +416,6 @@
MaterialManager::getSingleton().setDefaultAnisotropy(8);
MaterialManager::getSingleton().setDefaultTextureFiltering(tfo);
-
}
bool RigsOfRods::configure(void)
@@ -534,6 +533,5 @@
rgm.addResourceLocation(fullpath+(*iterFiles).filename+dirsep+"Temp",
"FileSystem", "TerrainFolders");
rgm.addResourceLocation(fullpath+(*iterFiles).filename+dirsep+"Templates",
"FileSystem", "TerrainFolders");
rgm.addResourceLocation(fullpath+(*iterFiles).filename+dirsep+"Terrain",
"FileSystem", "TerrainFolders");
-
}
-}
+}
\ No newline at end of file
Modified: trunk/source/main/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/RoRFrameListener.cpp 2010-12-30 00:58:41 UTC (rev
1563)
+++ trunk/source/main/RoRFrameListener.cpp 2011-01-15 22:00:50 UTC (rev
1564)
@@ -4685,8 +4685,9 @@
{
LogManager::getSingleton().logMessage("Loading Ogitor scene
format: " + terrainfile);
loadOgitorTerrain(terrainfile);
-
+#ifdef USE_MYGUI
LoadingWindow::get()->hide();
+#endif // USE_MYGUI
return;
}
@@ -4695,7 +4696,9 @@
LogManager::getSingleton().logMessage("Loading classic terrain
format: " + terrainfile);
loadClassicTerrain(terrainfile);
+#ifdef USE_MYGUI
LoadingWindow::get()->hide();
+#endif // USE_MYGUI
return;
}
Modified: trunk/source/main/SoundManager.cpp
===================================================================
--- trunk/source/main/SoundManager.cpp 2010-12-30 00:58:41 UTC (rev 1563)
+++ trunk/source/main/SoundManager.cpp 2011-01-15 22:00:50 UTC (rev 1564)
@@ -22,7 +22,7 @@
#include "Ogre.h"
#include "SoundManager.h"
#include "Settings.h"
-#include "pstdint.h"
+//#include "pstdint.h"
#include "rormemory.h"
// some gcc fixes
@@ -30,7 +30,6 @@
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif //OGRE_PLATFORM_LINUX
-
using namespace Ogre;
SoundManager::SoundManager()
@@ -482,8 +481,6 @@
return 0;
}
-
-
//-----------------------------------------------------------------------------------
Sound::Sound(int input_index, ALuint buffer, SoundManager *sm)
@@ -589,4 +586,4 @@
pthread_mutex_unlock(&sm->audio_mutex);
}
-#endif //OPENAL
+#endif //OPENAL
\ No newline at end of file
Modified: trunk/source/main/angelscript/scripthelper/scripthelper.cpp
===================================================================
--- trunk/source/main/angelscript/scripthelper/scripthelper.cpp 2010-12-30
00:58:41 UTC (rev 1563)
+++ trunk/source/main/angelscript/scripthelper/scripthelper.cpp 2011-01-15
22:00:50 UTC (rev 1564)
@@ -1,3 +1,5 @@
+#ifdef USE_ANGELSCRIPT
+
#include <string.h>
#include "scripthelper.h"
#include <string>
@@ -344,3 +346,5 @@
}
END_AS_NAMESPACE
+
+#endif // USE_ANGELSCRIPT
\ No newline at end of file
Modified: trunk/source/main/angelscript/scripthelper/scripthelper.h
===================================================================
--- trunk/source/main/angelscript/scripthelper/scripthelper.h 2010-12-30
00:58:41 UTC (rev 1563)
+++ trunk/source/main/angelscript/scripthelper/scripthelper.h 2011-01-15
22:00:50 UTC (rev 1564)
@@ -1,6 +1,8 @@
#ifndef SCRIPTHELPER_H
#define SCRIPTHELPER_H
+#ifdef USE_ANGELSCRIPT
+
#include <angelscript.h>
BEGIN_AS_NAMESPACE
@@ -25,4 +27,6 @@
END_AS_NAMESPACE
-#endif
+#endif // USE_ANGELSCRIPT
+
+#endif // SCRIPTHELPER_H
Modified: trunk/source/main/angelscript/scriptmath/scriptmath.cpp
===================================================================
--- trunk/source/main/angelscript/scriptmath/scriptmath.cpp 2010-12-30
00:58:41 UTC (rev 1563)
+++ trunk/source/main/angelscript/scriptmath/scriptmath.cpp 2011-01-15
22:00:50 UTC (rev 1564)
@@ -1,3 +1,5 @@
+#ifdef USE_ANGELSCRIPT
+
#include <assert.h>
#include <math.h>
#include <string.h>
@@ -275,4 +277,4 @@
END_AS_NAMESPACE
-
+#endif // USE_ANGELSCRIPT
Modified: trunk/source/main/angelscript/scriptmath/scriptmath.h
===================================================================
--- trunk/source/main/angelscript/scriptmath/scriptmath.h 2010-12-30
00:58:41 UTC (rev 1563)
+++ trunk/source/main/angelscript/scriptmath/scriptmath.h 2011-01-15
22:00:50 UTC (rev 1564)
@@ -1,6 +1,8 @@
#ifndef SCRIPTMATH_H
#define SCRIPTMATH_H
+#ifdef USE_ANGELSCRIPT
+
#include <angelscript.h>
BEGIN_AS_NAMESPACE
@@ -19,4 +21,6 @@
END_AS_NAMESPACE
-#endif
+#endif // USE_ANGELSCRIPT
+
+#endif // SCRIPTMATH_H
Modified: trunk/source/main/angelscript/scriptmath3d/scriptmath3d.cpp
===================================================================
--- trunk/source/main/angelscript/scriptmath3d/scriptmath3d.cpp 2010-12-30
00:58:41 UTC (rev 1563)
+++ trunk/source/main/angelscript/scriptmath3d/scriptmath3d.cpp 2011-01-15
22:00:50 UTC (rev 1564)
@@ -1,3 +1,5 @@
+#ifdef USE_ANGELSCRIPT
+
#include <assert.h>
#include <string.h> // strstr
#include <new> // new()
@@ -335,3 +337,4 @@
END_AS_NAMESPACE
+#endif // USE_ANGELSCRIPT
Modified: trunk/source/main/angelscript/scriptmath3d/scriptmath3d.h
===================================================================
--- trunk/source/main/angelscript/scriptmath3d/scriptmath3d.h 2010-12-30
00:58:41 UTC (rev 1563)
+++ trunk/source/main/angelscript/scriptmath3d/scriptmath3d.h 2011-01-15
22:00:50 UTC (rev 1564)
@@ -1,6 +1,8 @@
#ifndef SCRIPTMATH3D_H
#define SCRIPTMATH3D_H
+#ifdef USE_ANGELSCRIPT
+
#include <angelscript.h>
BEGIN_AS_NAMESPACE
@@ -49,4 +51,6 @@
END_AS_NAMESPACE
-#endif
+#endif //USE_ANGELSCRIPT
+
+#endif // SCRIPTMATH3D_H
Modified: trunk/source/main/angelscript/scriptstdstring/scriptstdstring.cpp
===================================================================
--- trunk/source/main/angelscript/scriptstdstring/scriptstdstring.cpp
2010-12-30 00:58:41 UTC (rev 1563)
+++ trunk/source/main/angelscript/scriptstdstring/scriptstdstring.cpp
2011-01-15 22:00:50 UTC (rev 1564)
@@ -1,3 +1,5 @@
+#ifdef USE_ANGELSCRIPT
+
#include <assert.h>
#include <sstream>
#include "scriptstdstring.h"
@@ -556,6 +558,5 @@
END_AS_NAMESPACE
+#endif // USE_ANGELSCRIPT
-
-
Modified: trunk/source/main/angelscript/scriptstdstring/scriptstdstring.h
===================================================================
--- trunk/source/main/angelscript/scriptstdstring/scriptstdstring.h
2010-12-30 00:58:41 UTC (rev 1563)
+++ trunk/source/main/angelscript/scriptstdstring/scriptstdstring.h
2011-01-15 22:00:50 UTC (rev 1564)
@@ -1,3 +1,5 @@
+#ifdef USE_ANGELSCRIPT
+
//
// Script std::string
//
@@ -20,4 +22,6 @@
END_AS_NAMESPACE
-#endif
+#endif // SCRIPTSTDSTRING_H
+
+#endif // USE_ANGELSCRIPT
Modified: trunk/source/main/gui_manager.cpp
===================================================================
--- trunk/source/main/gui_manager.cpp 2010-12-30 00:58:41 UTC (rev 1563)
+++ trunk/source/main/gui_manager.cpp 2011-01-15 22:00:50 UTC (rev 1564)
@@ -49,7 +49,7 @@
mSceneManager(mgr),
mWindow(win),
mExit(false),
- mResourceFileName("core.xml")
+ mResourceFileName("MyGUI_Core.xml")
{
create();
}
@@ -82,7 +82,7 @@
mPlatform = new MyGUI::OgrePlatform();
mPlatform->initialise(mWindow, mSceneManager,
ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, gui_logfilename);
mGUI = new MyGUI::Gui();
- mGUI->initialise(mResourceFileName, gui_logfilename);
+ mGUI->initialise(mResourceFileName);
}
void GUIManager::destroyGui()
@@ -160,5 +160,4 @@
if (!mGUI) return;
MyGUI::InputManager::getInstance().injectKeyRelease(_key);
}
-#endif //MYGUI
-
+#endif //MYGUI
\ No newline at end of file
Modified: trunk/source/main/gui_manager.h
===================================================================
--- trunk/source/main/gui_manager.h 2010-12-30 00:58:41 UTC (rev 1563)
+++ trunk/source/main/gui_manager.h 2011-01-15 22:00:50 UTC (rev 1564)
@@ -6,7 +6,7 @@
For more information, see http://www.rigsofrods.com/
Rigs of Rods is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 3, as
+it under the terms of the GNU General Public License version 3, as
published by the Free Software Foundation.
Rigs of Rods is distributed in the hope that it will be useful,
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef USE_MYGUI
+#ifdef USE_MYGUI
#ifndef GUI_MANAGER_H__
#define GUI_MANAGER_H__
@@ -78,5 +78,4 @@
#endif // GUI_MANAGER_H__
-#endif //MYGUI
-
+#endif //MYGUI
\ No newline at end of file
Modified: trunk/source/main/sha1.h
===================================================================
--- trunk/source/main/sha1.h 2010-12-30 00:58:41 UTC (rev 1563)
+++ trunk/source/main/sha1.h 2011-01-15 22:00:50 UTC (rev 1564)
@@ -35,7 +35,8 @@
#ifndef ___SHA1_HDR___
#define ___SHA1_HDR___
-#include "pstdint.h" // Needed for uint32_t, uint8_t
+#include <stdint.h> //"pstdint.h" // Needed for uint32_t, uint8_t
+#define uint8_t char
#if !defined(SHA1_UTILITY_FUNCTIONS) && !defined(SHA1_NO_UTILITY_FUNCTIONS)
#define SHA1_UTILITY_FUNCTIONS
@@ -80,7 +81,6 @@
namespace RoR
{
-
class CSHA1
{
public:
@@ -130,6 +130,5 @@
uint8_t m_workspace[64];
SHA1_WORKSPACE_BLOCK *m_block; // SHA1 pointer to the byte array above
};
-
}; //namespace RigsOfRods
-#endif
+#endif
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
