ubergames
/
ef2gamesource
mirror of https://github.com/UberGames/EF2GameSource.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux fixes (excludes Makefile which still has to be modified)

This commit is contained in:
Walter Julius Hennecke 2012-12-30 19:38:00 +01:00
parent a18c19c2bd
commit 4fad2ac3d9
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shared/qcommon/quaternion.h
View File

@ -18,7 +18,7 @@
#define _QUATERNION_H_ #define _QUATERNION_H_
#include <math.h> #include <math.h>
#include "vector.h" #include <game/vector.h>
//#include "Matrix.h" //#include "Matrix.h"
#define UNUSED_ARG (void) #define UNUSED_ARG (void)

2
dlls/game/UseData.h
View File

@ -55,7 +55,7 @@ class UseData : public Class
int _useCount; int _useCount;
public: public:
UseData::UseData() UseData()
:_useAnim(""), :_useAnim(""),
_useType(""), _useType(""),
_useThread(""), _useThread(""),

8
dlls/game/archive.h
View File

@ -182,6 +182,7 @@ inline qboolean Archiver::NoErrors
return ( !fileerror ); return ( !fileerror );
} }
template <>
inline void Container<str>::Archive inline void Container<str>::Archive
( (
Archiver &arc Archiver &arc
@ -206,6 +207,7 @@ inline void Container<str>::Archive
} }
} }
template <>
inline void Container<Vector>::Archive inline void Container<Vector>::Archive
( (
Archiver &arc Archiver &arc
@ -230,6 +232,7 @@ inline void Container<Vector>::Archive
} }
} }
template <>
inline void Container<int>::Archive inline void Container<int>::Archive
( (
Archiver &arc Archiver &arc
@ -254,6 +257,7 @@ inline void Container<int>::Archive
} }
} }
template <>
inline void Container<float>::Archive inline void Container<float>::Archive
( (
Archiver &arc Archiver &arc
@ -296,6 +300,7 @@ inline void Container<float>::Archive
// Returns: None // Returns: None
// //
//=============================================================== //===============================================================
template <>
inline void Container<Class*>::Archive inline void Container<Class*>::Archive
( (
Archiver &arc Archiver &arc
@ -327,6 +332,7 @@ inline void Container<Class*>::Archive
// Returns: None // Returns: None
// //
//=============================================================== //===============================================================
template <>
inline void Container<Class>::Archive inline void Container<Class>::Archive
( (
Archiver &arc Archiver &arc
@ -388,6 +394,7 @@ inline void Container< SafePtr<Class*> >::Archive
// Returns: None // Returns: None
// //
//=============================================================== //===============================================================
template <>
inline void Container<Entity*>::Archive inline void Container<Entity*>::Archive
( (
Archiver &arc Archiver &arc
@ -406,6 +413,7 @@ inline void Container<Entity*>::Archive
} }
} }
template <>
inline void Container<EntityPtr>::Archive inline void Container<EntityPtr>::Archive
( (
Archiver &arc Archiver &arc

5
dlls/game/beam.h
View File

@ -40,6 +40,9 @@ extern Event EV_FuncBeam_ToggleDelay;
extern Event EV_FuncBeam_FindEndpoint; extern Event EV_FuncBeam_FindEndpoint;
extern Event EV_FuncBeam_EndAlpha; extern Event EV_FuncBeam_EndAlpha;
class FuncBeam;
FuncBeam *CreateBeam( const char *model, const char *shader, const Vector &start, const Vector &end, int numsegments = 4, float scale = 1.0f, float life = 1.0f, float damage = 0.0f, Entity *origin_target=NULL );
class FuncBeam : public ScriptSlave class FuncBeam : public ScriptSlave
{ {
protected: protected:
@ -90,7 +93,7 @@ class FuncBeam : public ScriptSlave
virtual void setAngles( const Vector &ang ); virtual void setAngles( const Vector &ang );
virtual void Archive( Archiver &arc ); virtual void Archive( Archiver &arc );
friend FuncBeam *CreateBeam( const char *model, const char *shader, const Vector &start, const Vector &end, int numsegments = 4, float scale = 1.0f, float life = 1.0f, float damage = 0.0f, Entity *origin_target=NULL ); friend FuncBeam *CreateBeam( const char *model, const char *shader, const Vector &start, const Vector &end, int numsegments, float scale, float life, float damage, Entity *origin_target);
}; };
inline void FuncBeam::Archive inline void FuncBeam::Archive

1
dlls/game/container.h
View File

@ -35,6 +35,7 @@
// //
#include "g_local.h" #include "g_local.h"
extern game_import_t gi;
#define CONTAINER_Error gi.Error #define CONTAINER_Error gi.Error
#define CONTAINER_DPrintf gi.DPrintf #define CONTAINER_DPrintf gi.DPrintf
#define CONTAINER_WDPrintf gi.WDPrintf #define CONTAINER_WDPrintf gi.WDPrintf

17
dlls/game/listener.h
View File

@ -338,16 +338,13 @@ inline qboolean EventArgDef::isOptional
return optional; return optional;
} }
#ifndef GAME_DLL // interface functions
extern "C" void L_ProcessPendingEvents( void );
{ void L_ClearEventList( void );
// interface functions void L_InitEvents( void );
void L_ProcessPendingEvents( void ); void L_ShutdownEvents( void );
void L_ClearEventList( void ); void L_ArchiveEvents(Archiver& arc);
void L_InitEvents( void ); void L_UnarchiveEvents(Archiver& arc);
void L_ShutdownEvents( void );
}
#endif
class Listener; class Listener;