diff --git a/bblaunch/bblaunch.cpp b/bblaunch/bblaunch.cpp index 882a8b40..dfc809b2 100644 --- a/bblaunch/bblaunch.cpp +++ b/bblaunch/bblaunch.cpp @@ -1,4 +1,3 @@ - #include #include @@ -44,4 +43,4 @@ int WINAPI WinMain(_In_ HINSTANCE inst, _In_opt_ HINSTANCE prev, _In_ char* cmd, CloseHandle(processInfo.hThread); return 0; //Success! -} +} \ No newline at end of file diff --git a/bbruntime/basic.cpp b/bbruntime/basic.cpp index dcc500e3..ec6e327b 100644 --- a/bbruntime/basic.cpp +++ b/bbruntime/basic.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "bbsys.h" @@ -547,4 +546,4 @@ void basic_link(void (*rtSym)(const char* sym, void* pc)) { rtSym("_bbFMod", _bbFMod); rtSym("_bbFPow", _bbFPow); rtSym("RuntimeStats", bbRuntimeStats); -} +} \ No newline at end of file diff --git a/bbruntime/basic.h b/bbruntime/basic.h index 31035e87..6db2a4f4 100644 --- a/bbruntime/basic.h +++ b/bbruntime/basic.h @@ -1,4 +1,3 @@ - #ifndef BASIC_H #define BASIC_H diff --git a/bbruntime/bbaudio.cpp b/bbruntime/bbaudio.cpp index ddbc34b6..358a5724 100644 --- a/bbruntime/bbaudio.cpp +++ b/bbruntime/bbaudio.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "bbaudio.h" @@ -135,4 +134,4 @@ void audio_link(void(*rtSym)(const char*, void*)) { rtSym("ChannelPan%channel#pan", bbChannelPan); rtSym("%ChannelPlaying%channel", bbChannelPlaying); rtSym("%Load3DSound$filename", bbLoad3DSound); -} +} \ No newline at end of file diff --git a/bbruntime/bbaudio.h b/bbruntime/bbaudio.h index ccd56820..414ac3d5 100644 --- a/bbruntime/bbaudio.h +++ b/bbruntime/bbaudio.h @@ -1,4 +1,3 @@ - #ifndef BBAUDIO_H #define BBAUDIO_H @@ -25,4 +24,3 @@ void bbChannelPan(gxChannel* channel, float pan); int bbChannelPlaying(gxChannel* channel); #endif - diff --git a/bbruntime/bbbank.cpp b/bbruntime/bbbank.cpp index 71ecd0fb..aef89f92 100644 --- a/bbruntime/bbbank.cpp +++ b/bbruntime/bbbank.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "bbbank.h" #include "bbstream.h" @@ -169,6 +168,4 @@ void bank_link(void(*rtSym)(const char*, void*)) { rtSym("%ReadBytes%bank%file%offset%count", bbReadBytes); rtSym("%WriteBytes%bank%file%offset%count", bbWriteBytes); rtSym("%CallDLL$dll_name$func_name%in_bank=0%out_bank=0", bbCallDLL); -} - - +} \ No newline at end of file diff --git a/bbruntime/bbbank.h b/bbruntime/bbbank.h index 4c644420..6331c2e2 100644 --- a/bbruntime/bbbank.h +++ b/bbruntime/bbbank.h @@ -1,4 +1,3 @@ - #ifndef BBBANK_H #define BBBANK_H diff --git a/bbruntime/bbblitz3d.cpp b/bbruntime/bbblitz3d.cpp index 797cbd3a..a88484cf 100644 --- a/bbruntime/bbblitz3d.cpp +++ b/bbruntime/bbblitz3d.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "bbblitz3d.h" @@ -60,84 +59,101 @@ static std::map loader_mat_map; static inline void debug3d() { if(debug && !gx_scene) RTEX("3D Graphics mode not set."); } + static inline void debugTexture(Texture* t) { if(debug && !texture_set.count(t)) RTEX("Texture does not exist!"); } + static inline void debugBrush(Brush* b) { if(debug && !brush_set.count(b)) RTEX("Brush does not exist!"); } + static inline void debugEntity(Entity* e) { if(debug && !entity_set.count(e)) RTEX("Entity does not exist!"); } + static inline void debugParent(Entity* e) { if(debug) { debug3d(); if(e && !entity_set.count(e)) RTEX("Parent entity does not exist."); } } + static inline void debugMesh(MeshModel* m) { if(debug) { debugEntity(m); if(!m->getMeshModel()) RTEX("Entity is not a mesh!"); } } + static inline void debugObject(Object* o) { if(debug) { debugEntity(o); if(!o->getObject()) RTEX("Entity is not an object!"); } } + static inline void debugColl(Object* o, int index) { if(debug) { debugObject(o); if(index<1 || index>o->getCollisions().size()) RTEX("Collision index out of range."); } } + static inline void debugCamera(Camera* c) { if(debug) { debugEntity(c); if(!c->getCamera()) RTEX("Entity is not a camera!"); } } + static inline void debugLight(Light* l) { if(debug) { debugEntity(l); if(!l->getLight()) RTEX("Entity is not a light!"); } } + static inline void debugModel(Model* m) { if(debug) { debugEntity(m); if(!m->getModel()) RTEX("Entity is not a model!"); } } + static inline void debugSprite(Sprite* s) { if(debug) { debugModel(s); if(!s->getSprite()) RTEX("Entity is not a sprite!"); } } + static inline void debugMD2(MD2Model* m) { if(debug) { debugModel(m); if(!m->getMD2Model()) RTEX("Entity is not an MD2 Model!"); } } + static inline void debugBSP(Q3BSPModel* m) { if(debug) { debugModel(m); if(!m->getBSPModel()) RTEX("Entity is not a BSP Model!"); } } + static inline void debugTerrain(Terrain* t) { if(debug) { debugModel(t); if(!t->getTerrain()) RTEX("Entity is not a terrain!"); } } + static inline void debugSegs(int n) { if(debug) { debug3d(); if(n < 3 || n>50) RTEX("Illegal number of segments!"); } } + static inline void debugVertex(Surface* s, int n) { if(debug) { debug3d(); if(n < 0 || n >= s->numVertices()) RTEX("Vertex index out of range."); } } + static inline void debugVertex(Surface* s, int n, int t) { if(debug) { debug3d(); @@ -146,6 +162,7 @@ static inline void debugVertex(Surface* s, int n, int t) { } } + static Entity* loadEntity(std::string t, int hint) { t = tolower(t); int n = t.rfind("."); if(n == std::string::npos) return 0; @@ -213,68 +230,67 @@ static Entity* findChild(Entity* e, const std::string& t) { /////////////////////////// // GLOBAL WORLD COMMANDS // /////////////////////////// -void bbLoaderMatrix(BBStr* ext, float xx, float xy, float xz, float yx, float yy, float yz, float zx, float zy, float zz) { +void bbLoaderMatrix(BBStr* ext, float xx, float xy, float xz, float yx, float yy, float yz, float zx, float zy, float zz) { loader_mat_map.erase(*ext); loader_mat_map[*ext] = Transform(Matrix(Vector(xx, xy, xz), Vector(yx, yy, yz), Vector(zx, zy, zz))); delete ext; } -int bbHWTexUnits() { +int bbHWTexUnits() { debug3d(); return gx_scene->hwTexUnits(); } -int bbGfxDriverCaps3D() { +int bbGfxDriverCaps3D() { debug3d(); return gx_scene->gfxDriverCaps3D(); } -void bbHWMultiTex(int enable) { +void bbHWMultiTex(int enable) { debug3d(); gx_scene->setHWMultiTex(!!enable); } -void bbWBuffer(int enable) { +void bbWBuffer(int enable) { debug3d(); gx_scene->setWBuffer(!!enable); } -void bbDither(int enable) { +void bbDither(int enable) { debug3d(); gx_scene->setDither(!!enable); } -void bbAntiAlias(int enable) { +void bbAntiAlias(int enable) { debug3d(); gx_scene->setAntialias(!!enable); } -void bbWireFrame(int enable) { +void bbWireFrame(int enable) { debug3d(); gx_scene->setWireframe(!!enable); } -void bbAmbientLight(float r, float g, float b) { +void bbAmbientLight(float r, float g, float b) { debug3d(); Vector t(r * ctof, g * ctof, b * ctof); gx_scene->setAmbient(&(t.x)); } -void bbClearCollisions() { +void bbClearCollisions() { debug3d(); world->clearCollisions(); } -void bbCollisions(int src_type, int dest_type, int method, int response) { +void bbCollisions(int src_type, int dest_type, int method, int response) { debug3d(); world->addCollision(src_type, dest_type, method, response); } static int update_ms; -void bbUpdateWorld(float elapsed) { +void bbUpdateWorld(float elapsed) { debug3d(); - #ifdef BETA update_ms = gx_runtime->getMilliSecs(); world->update(elapsed); @@ -285,12 +301,12 @@ void bbUpdateWorld(float elapsed) { #endif } -void bbCaptureWorld() { +void bbCaptureWorld() { debug3d(); world->capture(); } -void bbRenderWorld(float tween) { +void bbRenderWorld(float tween) { debug3d(); //Should we remove this stuff? @@ -341,11 +357,11 @@ void bbRenderWorld(float tween) { #endif } -int bbTrisRendered() { +int bbTrisRendered() { return tri_count; } -float bbStats3D(int n) { +float bbStats3D(int n) { return stats3d[n]; } @@ -360,7 +376,6 @@ int bbRunningUnderWine() { //////////////// // MEMORYINFO // //////////////// - int bbMemoryLoad() { return gx_runtime->getMemoryLoad(); } @@ -386,7 +401,6 @@ int bbAvailVirtual() { ////////////////////// //Note: modify canvas->backup() to NOT release backup image! -// Texture* bbLoadTexture(BBStr* file, int flags) { debug3d(); Texture* t = new Texture(*file, flags); delete file; @@ -419,66 +433,66 @@ Texture* bbCreateTexture(int w, int h, int flags, int frames) { return t; } -void bbFreeTexture(Texture* t) { +void bbFreeTexture(Texture* t) { if(!t) return; debugTexture(t); if(texture_set.erase(t)) delete t; } -void bbTextureBlend(Texture* t, int blend) { +void bbTextureBlend(Texture* t, int blend) { debugTexture(t); t->setBlend(blend); } -void bbTextureCoords(Texture* t, int flags) { +void bbTextureCoords(Texture* t, int flags) { debugTexture(t); t->setFlags(flags); } -void bbTextureBumpEnvMat(Texture* t, int x, int y, float envmat) { +void bbTextureBumpEnvMat(Texture* t, int x, int y, float envmat) { debugTexture(t); t->setBumpEnvMat(x, y, envmat); } -void bbTextureBumpEnvScale(Texture* t, float envscale) { +void bbTextureBumpEnvScale(Texture* t, float envscale) { debugTexture(t); t->setBumpEnvScale(envscale); } -void bbTextureBumpEnvOffset(Texture* t, float envoffset) { +void bbTextureBumpEnvOffset(Texture* t, float envoffset) { debugTexture(t); t->setBumpEnvOffset(envoffset); } -void bbScaleTexture(Texture* t, float u_scale, float v_scale) { +void bbScaleTexture(Texture* t, float u_scale, float v_scale) { debugTexture(t); t->setScale(1 / u_scale, 1 / v_scale); } -void bbRotateTexture(Texture* t, float angle) { +void bbRotateTexture(Texture* t, float angle) { debugTexture(t); t->setRotation(-angle * dtor); } -void bbPositionTexture(Texture* t, float u_pos, float v_pos) { +void bbPositionTexture(Texture* t, float u_pos, float v_pos) { debugTexture(t); t->setPosition(-u_pos, -v_pos); } -void bbTextureLodBias(float bias) { +void bbTextureLodBias(float bias) { gx_scene->textureLodBias = *((DWORD*)&bias); } -void bbTextureAnisotropic(int level) { +void bbTextureAnisotropic(int level) { gx_scene->textureAnisotropic = level; } -int bbTextureWidth(Texture* t) { +int bbTextureWidth(Texture* t) { debugTexture(t); return t->getCanvas(0)->getWidth(); } -int bbTextureHeight(Texture* t) { +int bbTextureHeight(Texture* t) { debugTexture(t); return t->getCanvas(0)->getHeight(); } diff --git a/bbruntime/bbblitz3d.h b/bbruntime/bbblitz3d.h index f50ceb80..f6ca6c3a 100644 --- a/bbruntime/bbblitz3d.h +++ b/bbruntime/bbblitz3d.h @@ -1,4 +1,3 @@ - #ifndef BBBLITZ3D_H #define BBBLITZ3D_H @@ -7,5 +6,4 @@ extern gxScene* gx_scene; -#endif - +#endif \ No newline at end of file diff --git a/bbruntime/bbfilesystem.cpp b/bbruntime/bbfilesystem.cpp index d66625b0..0d94f94b 100644 --- a/bbruntime/bbfilesystem.cpp +++ b/bbruntime/bbfilesystem.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "bbfilesystem.h" #include "bbstream.h" @@ -183,4 +182,4 @@ void filesystem_link(void(*rtSym)(const char*, void*)) { rtSym("CopyFile$file$to", bbCopyFile); rtSym("DeleteFile$file", bbDeleteFile); rtSym("CreateFile$filename", bbCreateFile); -} +} \ No newline at end of file diff --git a/bbruntime/bbfilesystem.h b/bbruntime/bbfilesystem.h index 2524c668..84eef6cd 100644 --- a/bbruntime/bbfilesystem.h +++ b/bbruntime/bbfilesystem.h @@ -1,4 +1,3 @@ - #ifndef BBFILESYSTEM_H #define BBFILESYSTEM_H diff --git a/bbruntime/bbgraphics.h b/bbruntime/bbgraphics.h index c412f510..0d85033c 100644 --- a/bbruntime/bbgraphics.h +++ b/bbruntime/bbgraphics.h @@ -1,13 +1,12 @@ - #ifndef BBGRAPHICS_H #define BBGRAPHICS_H #include "bbsys.h" #include "../gxruntime/gxgraphics.h" -extern gxGraphics *gx_graphics; -extern gxCanvas *gx_canvas; -extern gxScene *gx_scene; +extern gxGraphics* gx_graphics; +extern gxCanvas* gx_canvas; +extern gxScene* gx_scene; class bbImage; @@ -28,8 +27,8 @@ int bbTotalVidMem(); //mode functions void bbGraphics( int w,int h,int d,int mode ); -gxCanvas * bbFrontBuffer(); -gxCanvas * bbBackBuffer(); +gxCanvas* bbFrontBuffer(); +gxCanvas* bbBackBuffer(); void bbEndGraphics(); int bbInFocus(); int bbGraphicsLost(); @@ -39,7 +38,7 @@ void bbFlip( int vwait ); //graphics buffer functions void bbSetBuffer( gxCanvas *buff ); -gxCanvas * bbGraphicsBuffer(); +gxCanvas* bbGraphicsBuffer(); int bbLoadBuffer( gxCanvas *surf,BBStr *str ); int bbSaveBuffer( gxCanvas *surf,BBStr *str ); @@ -63,7 +62,6 @@ void bbLine( int x1,int y1,int x2,int y2 ); void bbRect( int x,int y,int w,int h,int solid ); void bbOval( int x,int y,int w,int h,int solid ); void bbText( int x,int y,BBStr *str,int xPos,int yPos,int encoding ); -void bbSetChineseConvert(int c); BBStr* bbConvertToANSI(BBStr* str); BBStr* bbConvertToUTF8(BBStr* str); void bbGetColor( int x,int y ); @@ -72,7 +70,7 @@ int bbColorGreen(); int bbColorBlue(); //font functions -gxFont * bbLoadFont( BBStr *name,int height ); +gxFont* bbLoadFont( BBStr *name,int height ); void bbFreeFont( gxFont *f ); void bbSetFont( gxFont *f ); int bbFontWidth(); @@ -88,7 +86,7 @@ bbImage* bbLoadAnimImage( BBStr *s,int w,int h,int first,int cnt ); void bbFreeImage( bbImage *i ); int bbSaveImage( bbImage *i,BBStr *filename,int frame ); void bbGrabImage( bbImage *i,int x,int y,int n ); -gxCanvas * bbImageBuffer( bbImage *i,int n ); +gxCanvas* bbImageBuffer( bbImage *i,int n ); void bbDrawImage( bbImage *i,int x,int y,int frame ); void bbDrawBlock( bbImage *i,int x,int y,int frame ); void bbTileImage( bbImage *i,int x,int y,int frame ); @@ -117,7 +115,7 @@ int bbImageRectCollide( bbImage *i,int x,int y,int f,int r_x,int r_y,int r_w,i //simple print functions void bbWrite( BBStr *str,int encoding ); void bbPrint( BBStr *str,int encoding ); -BBStr * bbInput( BBStr *prompt ); +BBStr* bbInput( BBStr *prompt ); void bbLocate( int x,int y ); #endif \ No newline at end of file diff --git a/bbruntime/bbinput.cpp b/bbruntime/bbinput.cpp index 862b6fef..17fd4555 100644 --- a/bbruntime/bbinput.cpp +++ b/bbruntime/bbinput.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "bbsys.h" #include "../gxruntime/gxutf8.h" @@ -308,4 +307,4 @@ void input_link(void (*rtSym)(const char* sym, void* pc)) { rtSym("EnableDirectInput%enable", bbEnableDirectInput); rtSym("%DirectInputEnabled", bbDirectInputEnabled); -} +} \ No newline at end of file diff --git a/bbruntime/bbinput.h b/bbruntime/bbinput.h index 80df0da5..c90213c0 100644 --- a/bbruntime/bbinput.h +++ b/bbruntime/bbinput.h @@ -1,4 +1,3 @@ - #ifndef BBINPUT_H #define BBINPUT_H diff --git a/bbruntime/bbmath.cpp b/bbruntime/bbmath.cpp index 645f2492..e7a9e51d 100644 --- a/bbruntime/bbmath.cpp +++ b/bbruntime/bbmath.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "bbmath.h" #include @@ -91,4 +90,4 @@ void math_link(void (*rtSym)(const char* sym, void* pc)) { rtSym("SetRndSeed%seed", bbSeedRnd); rtSym("%RndSeed", bbRndSeed); rtSym("%GetRndSeed", bbRndSeed); -} +} \ No newline at end of file diff --git a/bbruntime/bbmath.h b/bbruntime/bbmath.h index 8fa1aee9..53261def 100644 --- a/bbruntime/bbmath.h +++ b/bbruntime/bbmath.h @@ -1,4 +1,3 @@ - #ifndef BBMATH_H #define BBMATH_H diff --git a/bbruntime/bbruntime.cpp b/bbruntime/bbruntime.cpp index ed8e49ae..6af43058 100644 --- a/bbruntime/bbruntime.cpp +++ b/bbruntime/bbruntime.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "bbsys.h" #include "bbruntime.h" @@ -8,10 +7,11 @@ std::string* ErrorMessagePool::memoryAccessViolation = 0; int ErrorMessagePool::size = 0; -void bbEnd() { +void bbEnd() { RTEX(0); } -void bbStop() { + +void bbStop() { gx_runtime->debugStop(); if(!gx_runtime->idle()) RTEX(0); } @@ -21,12 +21,12 @@ void bbDisableClose() { RemoveMenu(hmenu, SC_CLOSE, MF_BYCOMMAND); } -void bbAppTitle(BBStr* ti, BBStr* cp) { +void bbAppTitle(BBStr* ti, BBStr* cp) { gx_runtime->setTitle(*ti, *cp); delete ti, cp; } -void bbRuntimeError(BBStr* str) { +void bbRuntimeError(BBStr* str) { std::string t = *str; delete str; if(t.size() > 255) t[255] = 0; static char err[256]; @@ -47,7 +47,7 @@ void bbSetErrorMsg(int pos, BBStr* str) { delete str; } -int bbExecFile(BBStr* f) { +int bbExecFile(BBStr* f) { std::string t = *f; delete f; int n = gx_runtime->execute(t); @@ -55,11 +55,11 @@ int bbExecFile(BBStr* f) { return n; } -void bbDelay(int ms) { +void bbDelay(int ms) { if(!gx_runtime->delay(ms)) RTEX(0); } -int bbMilliSecs() { +int bbMilliSecs() { return gx_runtime->getMilliSecs(); } @@ -79,7 +79,7 @@ BBStr* bbGetEnv(BBStr* env_var) { return val; } -void bbSetEnv(BBStr* env_var, BBStr* val) { +void bbSetEnv(BBStr* env_var, BBStr* val) { std::string t = *env_var + "=" + *val; putenv(t.c_str()); delete env_var; @@ -91,14 +91,14 @@ gxTimer* bbCreateTimer(int hertz) { return t; } -int bbWaitTimer(gxTimer* t) { +int bbWaitTimer(gxTimer* t) { int n = t->wait(); delete t; if(!gx_runtime->idle()) RTEX(0); return n; } -void bbFreeTimer(gxTimer* t) { +void bbFreeTimer(gxTimer* t) { gx_runtime->freeTimer(t); delete t; } @@ -137,21 +137,21 @@ void bbSetClipboardContents(BBStr* contents) { CloseClipboard(); } -void bbDebugLog(BBStr* t) { +void bbDebugLog(BBStr* t) { gx_runtime->debugLog(t->c_str()); delete t; } -void _bbDebugStmt(int pos, const char* file) { +void _bbDebugStmt(int pos, const char* file) { gx_runtime->debugStmt(pos, file); if(!gx_runtime->idle()) RTEX(0); } -void _bbDebugEnter(void* frame, void* env, const char* func) { +void _bbDebugEnter(void* frame, void* env, const char* func) { gx_runtime->debugEnter(frame, env, func); } -void _bbDebugLeave() { +void _bbDebugLeave() { gx_runtime->debugLeave(); } @@ -300,4 +300,4 @@ const char* bbruntime_run(gxRuntime* rt, void (*pc)(), bool dbg) { void bbruntime_panic(const char* err) { RTEX(err); -} +} \ No newline at end of file diff --git a/bbruntime/bbruntime.h b/bbruntime/bbruntime.h index 00c17df8..8d6a5dd8 100644 --- a/bbruntime/bbruntime.h +++ b/bbruntime/bbruntime.h @@ -1,10 +1,6 @@ - /* - Platform neutral runtime library. - To be statically linked with an appropriate gxruntime driver. - */ #ifndef BBRUNTIME_H @@ -16,9 +12,7 @@ To be statically linked with an appropriate gxruntime driver. #include "../gxruntime/gxruntime.h" void bbruntime_link(void (*rtSym)(const char* sym, void* pc)); - const char* bbruntime_run(gxRuntime* runtime, void (*pc)(), bool debug); - void bbruntime_panic(const char* err); class ErrorMessagePool { diff --git a/bbruntime/bbsockets.cpp b/bbruntime/bbsockets.cpp index 4ce26c9c..a16e99d2 100644 --- a/bbruntime/bbsockets.cpp +++ b/bbruntime/bbsockets.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "bbsockets.h" #include @@ -600,4 +599,4 @@ void sockets_link(void(*rtSym)(const char*, void*)) { rtSym("$ParseDomainTXT$txt$name", bbParseDomainTXT); rtSym("%DownloadFile$url$file", bbDownloadFile); -} +} \ No newline at end of file diff --git a/bbruntime/bbsockets.h b/bbruntime/bbsockets.h index 21d79e93..c6b4d782 100644 --- a/bbruntime/bbsockets.h +++ b/bbruntime/bbsockets.h @@ -1,8 +1,6 @@ - #ifndef BBSOCKETS_H #define BBSOCKETS_H #include "bbstream.h" -#endif - +#endif \ No newline at end of file diff --git a/bbruntime/bbstream.cpp b/bbruntime/bbstream.cpp index 26eef6d4..f1451985 100644 --- a/bbruntime/bbstream.cpp +++ b/bbruntime/bbstream.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "bbstream.h" @@ -179,7 +178,4 @@ void stream_link(void(*rtSym)(const char*, void*)) { rtSym("WriteString%stream$string", bbWriteString); rtSym("WriteLine%stream$string", bbWriteLine); rtSym("CopyStream%src_stream%dest_stream%buffer_size=16384", bbCopyStream); -} - - - +} \ No newline at end of file diff --git a/bbruntime/bbstream.h b/bbruntime/bbstream.h index 24cbf753..3569000b 100644 --- a/bbruntime/bbstream.h +++ b/bbruntime/bbstream.h @@ -1,4 +1,3 @@ - #ifndef BBSTREAM_H #define BBSTREAM_H diff --git a/bbruntime/bbstring.cpp b/bbruntime/bbstring.cpp index 204c02d2..8572b0f9 100644 --- a/bbruntime/bbstring.cpp +++ b/bbruntime/bbstring.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "bbsys.h" #include "../gxruntime/gxutf8.h" @@ -161,4 +160,4 @@ void string_link(void(*rtSym)(const char*, void*)) { rtSym("$Bin%value", bbBin); rtSym("$CurrentDate", bbCurrentDate); rtSym("$CurrentTime", bbCurrentTime); -} +} \ No newline at end of file diff --git a/bbruntime/bbstring.h b/bbruntime/bbstring.h index df8aa920..55222a60 100644 --- a/bbruntime/bbstring.h +++ b/bbruntime/bbstring.h @@ -1,4 +1,3 @@ - #ifndef BBSTRING_H #define BBSTRING_H diff --git a/bbruntime/bbsys.cpp b/bbruntime/bbsys.cpp index b02f1880..2c982bef 100644 --- a/bbruntime/bbsys.cpp +++ b/bbruntime/bbsys.cpp @@ -1,6 +1,5 @@ - #include "std.h" #include "bbsys.h" bool debug; -gxRuntime* gx_runtime; +gxRuntime* gx_runtime; \ No newline at end of file diff --git a/bbruntime/bbsys.h b/bbruntime/bbsys.h index dbc7e2d6..59c951a4 100644 --- a/bbruntime/bbsys.h +++ b/bbruntime/bbsys.h @@ -1,4 +1,3 @@ - #ifndef BBSYS_H #define BBSYS_H diff --git a/bbruntime/std.cpp b/bbruntime/std.cpp index 97e3d0d2..66e8e905 100644 --- a/bbruntime/std.cpp +++ b/bbruntime/std.cpp @@ -1,2 +1 @@ - #include "std.h" \ No newline at end of file diff --git a/bbruntime/std.h b/bbruntime/std.h index a1a3fd55..3ec3d50b 100644 --- a/bbruntime/std.h +++ b/bbruntime/std.h @@ -1,4 +1,3 @@ - #ifndef STD_H #define STD_H @@ -17,4 +16,4 @@ #include -#endif +#endif \ No newline at end of file diff --git a/bbruntime/userlibs.cpp b/bbruntime/userlibs.cpp index 58cff29c..f49b04f6 100644 --- a/bbruntime/userlibs.cpp +++ b/bbruntime/userlibs.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "bbsys.h" #include "userlibs.h" @@ -91,6 +90,4 @@ void userlibs_link(void(*rtSym)(const char*, void*)) { rtSym("_bbLoadLibs", _bbLoadLibs); rtSym("_bbStrToCStr", _bbStrToCStr); rtSym("_bbCStrToStr", _bbCStrToStr); -} - - +} \ No newline at end of file diff --git a/bbruntime/userlibs.h b/bbruntime/userlibs.h index c37ee609..27be6aae 100644 --- a/bbruntime/userlibs.h +++ b/bbruntime/userlibs.h @@ -1,4 +1,3 @@ - #ifndef USERLIBS_H #define USERLIBS_H @@ -9,4 +8,4 @@ void _bbLoadLibs(char* p); const char* _bbStrToCStr(BBStr* str); BBStr* _bbCStrToStr(const char* str); -#endif +#endif \ No newline at end of file diff --git a/bbruntime_dll/bbruntime_dll.aps b/bbruntime_dll/bbruntime_dll.aps index f4ab363a..9c18c4b1 100644 Binary files a/bbruntime_dll/bbruntime_dll.aps and b/bbruntime_dll/bbruntime_dll.aps differ diff --git a/bbruntime_dll/bbruntime_dll.cpp b/bbruntime_dll/bbruntime_dll.cpp index f8571f7c..7d8c4a3a 100644 --- a/bbruntime_dll/bbruntime_dll.cpp +++ b/bbruntime_dll/bbruntime_dll.cpp @@ -1,4 +1,3 @@ - #pragma warning( disable:4786 ) #include "bbruntime_dll.h" @@ -345,5 +344,4 @@ int __stdcall bbWinMain() { ExitProcess(0); return 0; -} - +} \ No newline at end of file diff --git a/bbruntime_dll/bbruntime_dll.h b/bbruntime_dll/bbruntime_dll.h index 5b6a850d..c6b45168 100644 --- a/bbruntime_dll/bbruntime_dll.h +++ b/bbruntime_dll/bbruntime_dll.h @@ -1,4 +1,3 @@ - /* Win32 runtime dynamic link lib */ #ifndef BBRUNTIME_DLL_H diff --git a/blitz/libs.cpp b/blitz/libs.cpp index e0f2ce2f..839a51e5 100644 --- a/blitz/libs.cpp +++ b/blitz/libs.cpp @@ -1,4 +1,3 @@ - #include "libs.h" #include @@ -320,4 +319,4 @@ void closeLibs() { runtimeLib = 0; runtimeHMOD = 0; linkerHMOD = 0; -} +} \ No newline at end of file diff --git a/blitz/libs.h b/blitz/libs.h index ab441c69..9ccc254b 100644 --- a/blitz/libs.h +++ b/blitz/libs.h @@ -1,4 +1,3 @@ - #ifndef LIBS_H #define LIBS_H @@ -35,4 +34,4 @@ const char* linkLibs(); void closeLibs(); -#endif +#endif \ No newline at end of file diff --git a/blitz/main.cpp b/blitz/main.cpp index 62c8843a..7d402e94 100644 --- a/blitz/main.cpp +++ b/blitz/main.cpp @@ -1,4 +1,3 @@ - #include "libs.h" #include diff --git a/blitz3d/animation.cpp b/blitz3d/animation.cpp index c9aa8b28..5f7763d3 100644 --- a/blitz3d/animation.cpp +++ b/blitz3d/animation.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "animation.h" @@ -137,4 +136,4 @@ Vector Animation::getPosition(float time)const { Quat Animation::getRotation(float time)const { if(!rep->rot_anim.size()) return Quat(); return rep->getSlerpValue(rep->rot_anim, time); -} +} \ No newline at end of file diff --git a/blitz3d/animation.h b/blitz3d/animation.h index 5f824700..cea8aa3e 100644 --- a/blitz3d/animation.h +++ b/blitz3d/animation.h @@ -1,4 +1,3 @@ - #ifndef ANIMATION_H #define ANIMATION_H diff --git a/blitz3d/animator.cpp b/blitz3d/animator.cpp index d945c07a..b5573391 100644 --- a/blitz3d/animator.cpp +++ b/blitz3d/animator.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "animator.h" #include "object.h" @@ -215,5 +214,4 @@ void Animator::update(float elapsed) { } updateAnim(); -} - +} \ No newline at end of file diff --git a/blitz3d/animator.h b/blitz3d/animator.h index 07b99d93..32357c53 100644 --- a/blitz3d/animator.h +++ b/blitz3d/animator.h @@ -1,4 +1,3 @@ - #ifndef ANIMATOR_H #define ANIMATOR_H diff --git a/blitz3d/blitz3d.h b/blitz3d/blitz3d.h index 2aa24bcd..c68c1a93 100644 --- a/blitz3d/blitz3d.h +++ b/blitz3d/blitz3d.h @@ -1,4 +1,3 @@ - #ifndef BLITZ3D_H #define BLITZ3D_H diff --git a/blitz3d/brush.cpp b/blitz3d/brush.cpp index 1b00fce1..2b57154c 100644 --- a/blitz3d/brush.cpp +++ b/blitz3d/brush.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "brush.h" @@ -216,4 +215,4 @@ const gxScene::RenderState& Brush::getRenderState()const { bool Brush::operator<(const Brush& t)const { return memcmp(&getRenderState(), &t.getRenderState(), sizeof(gxScene::RenderState)) < 0; -} +} \ No newline at end of file diff --git a/blitz3d/brush.h b/blitz3d/brush.h index a76486d7..427387af 100644 --- a/blitz3d/brush.h +++ b/blitz3d/brush.h @@ -1,4 +1,3 @@ - #ifndef BRUSH_H #define BRUSH_H @@ -39,4 +38,4 @@ class Brush { Rep* write()const; }; -#endif +#endif \ No newline at end of file diff --git a/blitz3d/cachedtexture.cpp b/blitz3d/cachedtexture.cpp index 35981dcc..d4659796 100644 --- a/blitz3d/cachedtexture.cpp +++ b/blitz3d/cachedtexture.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "cachedtexture.h" diff --git a/blitz3d/cachedtexture.h b/blitz3d/cachedtexture.h index 47909ce7..c11f938d 100644 --- a/blitz3d/cachedtexture.h +++ b/blitz3d/cachedtexture.h @@ -1,4 +1,3 @@ - #ifndef CACHEDTEXTURE_H #define CACHEDTEXTURE_H @@ -30,4 +29,4 @@ class CachedTexture { static std::set rep_set; }; -#endif +#endif \ No newline at end of file diff --git a/blitz3d/camera.cpp b/blitz3d/camera.cpp index 7dd023d6..a8d29574 100644 --- a/blitz3d/camera.cpp +++ b/blitz3d/camera.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "camera.h" @@ -114,4 +113,4 @@ bool Camera::beginRenderFrame() { gx_scene->setFogColor((float*)&fog_color.x); gx_scene->setFogMode(fog_mode); return true; -} +} \ No newline at end of file diff --git a/blitz3d/camera.h b/blitz3d/camera.h index 2a10789d..89d03d57 100644 --- a/blitz3d/camera.h +++ b/blitz3d/camera.h @@ -1,4 +1,3 @@ - #ifndef CAMERA_H #define CAMERA_H @@ -56,4 +55,4 @@ class Camera : public Object { mutable bool local_valid; }; -#endif +#endif \ No newline at end of file diff --git a/blitz3d/collision.cpp b/blitz3d/collision.cpp index a460d657..bd71440c 100644 --- a/blitz3d/collision.cpp +++ b/blitz3d/collision.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "collision.h" @@ -162,4 +161,4 @@ bool Collision::boxCollide(const Line& line, float radius, const Box& box) { edgeTest(v3, v0, p.n, p3.n, line, radius, this); } return hit; -} +} \ No newline at end of file diff --git a/blitz3d/collision.h b/blitz3d/collision.h index 34d366ee..2b1055e1 100644 --- a/blitz3d/collision.h +++ b/blitz3d/collision.h @@ -1,4 +1,3 @@ - #ifndef COLLISION_H #define COLLISION_H diff --git a/blitz3d/entity.cpp b/blitz3d/entity.cpp index 57e0c9eb..01ed11a1 100644 --- a/blitz3d/entity.cpp +++ b/blitz3d/entity.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "entity.h" @@ -194,4 +193,4 @@ const Vector& Entity::getWorldScale()const { const Quat& Entity::getWorldRotation()const { world_rot = _parent ? _parent->getWorldRotation() * local_rot : local_rot; return world_rot; -} +} \ No newline at end of file diff --git a/blitz3d/entity.h b/blitz3d/entity.h index ec4147c4..bdd2bda6 100644 --- a/blitz3d/entity.h +++ b/blitz3d/entity.h @@ -1,4 +1,3 @@ - #ifndef ENTITY_H #define ENTITY_H @@ -98,4 +97,4 @@ class Entity { void invalidateWorld(); }; -#endif +#endif \ No newline at end of file diff --git a/blitz3d/frustum.cpp b/blitz3d/frustum.cpp index deb136f3..2a42ef58 100644 --- a/blitz3d/frustum.cpp +++ b/blitz3d/frustum.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "frustum.h" @@ -51,4 +50,4 @@ void Frustum::makePlanes() { if(planes[PLANE_NEAR].distance(verts[VERT_EYE]) > 0) { for(int k = 0; k < 6; ++k) planes[k] = -planes[k]; } -} +} \ No newline at end of file diff --git a/blitz3d/frustum.h b/blitz3d/frustum.h index 4d7e565f..9db79b39 100644 --- a/blitz3d/frustum.h +++ b/blitz3d/frustum.h @@ -1,4 +1,3 @@ - #ifndef FRUSTUM_H #define FRUSTUM_H diff --git a/blitz3d/geom.cpp b/blitz3d/geom.cpp index 5c24929b..60ea2265 100644 --- a/blitz3d/geom.cpp +++ b/blitz3d/geom.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "geom.h" diff --git a/blitz3d/geom.h b/blitz3d/geom.h index 1bd72deb..83b38437 100644 --- a/blitz3d/geom.h +++ b/blitz3d/geom.h @@ -1,4 +1,3 @@ - #ifndef GEOM_H #define GEOM_H diff --git a/blitz3d/light.cpp b/blitz3d/light.cpp index bec45069..f27c9775 100644 --- a/blitz3d/light.cpp +++ b/blitz3d/light.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "light.h" #include "../gxruntime/gxscene.h" @@ -30,4 +29,4 @@ bool Light::beginRender(float tween) { light->setPosition(&getRenderTform().v.x); light->setDirection(&getRenderTform().m.k.x); return true; -} +} \ No newline at end of file diff --git a/blitz3d/light.h b/blitz3d/light.h index dde6f26b..ff776b78 100644 --- a/blitz3d/light.h +++ b/blitz3d/light.h @@ -1,4 +1,3 @@ - #ifndef LIGHT_H #define LIGHT_H diff --git a/blitz3d/listener.cpp b/blitz3d/listener.cpp index db3b06ee..e6ab926b 100644 --- a/blitz3d/listener.cpp +++ b/blitz3d/listener.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "listener.h" @@ -31,4 +30,4 @@ void Listener::renderListener() { const Vector& up = getWorldTform().m.j.normalized(); gx_audio->set3dListener(&pos.x, &vel.x, &forward.x, &up.x); -} +} \ No newline at end of file diff --git a/blitz3d/listener.h b/blitz3d/listener.h index dd7c97e9..b3f122fb 100644 --- a/blitz3d/listener.h +++ b/blitz3d/listener.h @@ -1,4 +1,3 @@ - #ifndef LISTENER_H #define LISTENER_H diff --git a/blitz3d/loader_3ds.cpp b/blitz3d/loader_3ds.cpp index 5ff17026..bd4f0194 100644 --- a/blitz3d/loader_3ds.cpp +++ b/blitz3d/loader_3ds.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "loader_3ds.h" #include "meshmodel.h" @@ -511,4 +510,4 @@ MeshModel* Loader_3DS::load(const std::string& filename, const Transform& t, int id_map.clear(); return root; -} +} \ No newline at end of file diff --git a/blitz3d/loader_3ds.h b/blitz3d/loader_3ds.h index a7c1204a..136909dd 100644 --- a/blitz3d/loader_3ds.h +++ b/blitz3d/loader_3ds.h @@ -1,4 +1,3 @@ - #ifndef LOADER_3DS_H #define LOADER_3DS_H diff --git a/blitz3d/loader_b3d.cpp b/blitz3d/loader_b3d.cpp index 5b610776..ea574f74 100644 --- a/blitz3d/loader_b3d.cpp +++ b/blitz3d/loader_b3d.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "loader_b3d.h" #include "meshmodel.h" @@ -358,4 +357,4 @@ MeshModel* Loader_B3D::load(const std::string& f, const Transform& conv, int hin ::clear(); return obj ? obj->getModel()->getMeshModel() : 0; -} +} \ No newline at end of file diff --git a/blitz3d/loader_b3d.h b/blitz3d/loader_b3d.h index a3e3533e..f221f9fd 100644 --- a/blitz3d/loader_b3d.h +++ b/blitz3d/loader_b3d.h @@ -1,4 +1,3 @@ - #ifndef LOADER_B3D_H #define LOADER_B3D_H @@ -9,4 +8,4 @@ class Loader_B3D : public MeshLoader { MeshModel* load(const std::string& f, const Transform& conv, int hint); }; -#endif +#endif \ No newline at end of file diff --git a/blitz3d/loader_x.cpp b/blitz3d/loader_x.cpp index 93249c51..5c6af2da 100644 --- a/blitz3d/loader_x.cpp +++ b/blitz3d/loader_x.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "loader_x.h" #include "meshmodel.h" @@ -391,4 +390,4 @@ MeshModel* Loader_X::load(const std::string& filename, const Transform& t, int h MeshModel* e = parseFile(filename); frames_map.clear(); return e; -} +} \ No newline at end of file diff --git a/blitz3d/loader_x.h b/blitz3d/loader_x.h index aebf8e62..8cfe4d77 100644 --- a/blitz3d/loader_x.h +++ b/blitz3d/loader_x.h @@ -1,4 +1,3 @@ - #ifndef LOADER_X_H #define LOADER_X_H @@ -9,4 +8,4 @@ class Loader_X : public MeshLoader { MeshModel* load(const std::string& f, const Transform& conv, int hint); }; -#endif +#endif \ No newline at end of file diff --git a/blitz3d/md2model.cpp b/blitz3d/md2model.cpp index 3cb25971..8428582f 100644 --- a/blitz3d/md2model.cpp +++ b/blitz3d/md2model.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "md2rep.h" #include "md2model.h" @@ -128,4 +127,4 @@ int MD2Model::getMD2AnimLength()const { bool MD2Model::getValid()const { return rep->numFrames() > 0; -} +} \ No newline at end of file diff --git a/blitz3d/md2model.h b/blitz3d/md2model.h index aff7a75e..cd0dbfa8 100644 --- a/blitz3d/md2model.h +++ b/blitz3d/md2model.h @@ -1,4 +1,3 @@ - #ifndef MD2MODEL_H #define MD2MODEL_H diff --git a/blitz3d/md2norms.cpp b/blitz3d/md2norms.cpp index 072150c9..a2c27535 100644 --- a/blitz3d/md2norms.cpp +++ b/blitz3d/md2norms.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "md2norms.h" @@ -164,4 +163,4 @@ float md2norms[162][3] = { {-0.425325f, 0.688191f, -0.587785f}, {-0.425325f, -0.688191f, -0.587785f}, {-0.587785f, -0.425325f, -0.688191f}, -{-0.688191f, -0.587785f, -0.425325f} }; +{-0.688191f, -0.587785f, -0.425325f} }; \ No newline at end of file diff --git a/blitz3d/md2norms.h b/blitz3d/md2norms.h index 6fcda21f..19bf6eac 100644 --- a/blitz3d/md2norms.h +++ b/blitz3d/md2norms.h @@ -1,4 +1,3 @@ - #ifndef MD2NORMS_H #define MD2NORMS_H diff --git a/blitz3d/md2rep.cpp b/blitz3d/md2rep.cpp index 0428b0d5..dd64b205 100644 --- a/blitz3d/md2rep.cpp +++ b/blitz3d/md2rep.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "md2rep.h" #include "md2norms.h" @@ -262,5 +261,4 @@ void MD2Rep::render(Model* model, const Vert* v_a, int render_b, float render_t) mesh->unlock(); model->enqueue(mesh, 0, n_verts, 0, n_tris); -} - +} \ No newline at end of file diff --git a/blitz3d/md2rep.h b/blitz3d/md2rep.h index 29e5553b..3357b539 100644 --- a/blitz3d/md2rep.h +++ b/blitz3d/md2rep.h @@ -1,4 +1,3 @@ - #ifndef MD2REP_H #define MD2REP_H diff --git a/blitz3d/meshcollider.cpp b/blitz3d/meshcollider.cpp index 2d603d43..1ff9b7eb 100644 --- a/blitz3d/meshcollider.cpp +++ b/blitz3d/meshcollider.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "meshcollider.h" @@ -196,4 +195,4 @@ bool MeshCollider::intersects(const MeshCollider& c, const Transform& t)const { } } return false; -} +} \ No newline at end of file diff --git a/blitz3d/meshcollider.h b/blitz3d/meshcollider.h index 7a8e8d1b..108ab561 100644 --- a/blitz3d/meshcollider.h +++ b/blitz3d/meshcollider.h @@ -1,4 +1,3 @@ - #ifndef MESHCOLLIDER_H #define MESHCOLLIDER_H diff --git a/blitz3d/meshloader.cpp b/blitz3d/meshloader.cpp index 2606b5f4..8b0ccd31 100644 --- a/blitz3d/meshloader.cpp +++ b/blitz3d/meshloader.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "meshloader.h" #include "meshmodel.h" @@ -127,4 +126,4 @@ void MeshLoader::endMesh(MeshModel* mesh) { delete ml_mesh; ml_mesh = mesh_stack.back(); mesh_stack.pop_back(); -} +} \ No newline at end of file diff --git a/blitz3d/meshloader.h b/blitz3d/meshloader.h index 0053198e..49fc9e98 100644 --- a/blitz3d/meshloader.h +++ b/blitz3d/meshloader.h @@ -1,4 +1,3 @@ - #ifndef MESHLOADER_H #define MESHLOADER_H diff --git a/blitz3d/meshmodel.cpp b/blitz3d/meshmodel.cpp index 1a8d3e6d..21f1f497 100644 --- a/blitz3d/meshmodel.cpp +++ b/blitz3d/meshmodel.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "meshmodel.h" #include "meshcollider.h" @@ -311,4 +310,4 @@ bool MeshModel::collide(const Line& line, float radius, Collision* curr_coll, co bool MeshModel::intersects(const MeshModel& m)const { return getCollider()->intersects(*m.getCollider(), -m.getWorldTform() * getWorldTform()); -} +} \ No newline at end of file diff --git a/blitz3d/meshmodel.h b/blitz3d/meshmodel.h index 7d0083e7..1ee15b3d 100644 --- a/blitz3d/meshmodel.h +++ b/blitz3d/meshmodel.h @@ -1,4 +1,3 @@ - #ifndef MESHMODEL_H #define MESHMODEL_H @@ -57,4 +56,4 @@ class MeshModel : public Model { std::vector surf_bones; }; -#endif +#endif \ No newline at end of file diff --git a/blitz3d/meshutil.cpp b/blitz3d/meshutil.cpp index 6f530dc6..0d7a41a9 100644 --- a/blitz3d/meshutil.cpp +++ b/blitz3d/meshutil.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "meshutil.h" @@ -227,4 +226,4 @@ void MeshUtil::lightMesh(MeshModel* m, const Vector& pos, const Vector& rgb, flo } } } -} +} \ No newline at end of file diff --git a/blitz3d/meshutil.h b/blitz3d/meshutil.h index e7e67743..070b4142 100644 --- a/blitz3d/meshutil.h +++ b/blitz3d/meshutil.h @@ -1,4 +1,3 @@ - #ifndef MESHUTIL_H #define MESHUTIL_H diff --git a/blitz3d/mirror.cpp b/blitz3d/mirror.cpp index 1fcbc894..3584a3d9 100644 --- a/blitz3d/mirror.cpp +++ b/blitz3d/mirror.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "mirror.h" diff --git a/blitz3d/mirror.h b/blitz3d/mirror.h index 1158b14c..67fd8741 100644 --- a/blitz3d/mirror.h +++ b/blitz3d/mirror.h @@ -1,4 +1,3 @@ - #ifndef MIRROR_H #define MIRROR_H diff --git a/blitz3d/model.cpp b/blitz3d/model.cpp index 775e1fae..4091901b 100644 --- a/blitz3d/model.cpp +++ b/blitz3d/model.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "model.h" @@ -126,4 +125,4 @@ void Model::renderQueue(int type) { q->render(); delete q; } -} +} \ No newline at end of file diff --git a/blitz3d/model.h b/blitz3d/model.h index 732584c5..899774be 100644 --- a/blitz3d/model.h +++ b/blitz3d/model.h @@ -1,4 +1,3 @@ - #ifndef MODEL_H #define MODEL_H diff --git a/blitz3d/object.cpp b/blitz3d/object.cpp index 61559163..06c8ac76 100644 --- a/blitz3d/object.cpp +++ b/blitz3d/object.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "object.h" @@ -160,4 +159,4 @@ void Object::updateSounds() { else channels[k] = 0; } } -} +} \ No newline at end of file diff --git a/blitz3d/object.h b/blitz3d/object.h index db189fb0..b9bb32af 100644 --- a/blitz3d/object.h +++ b/blitz3d/object.h @@ -1,4 +1,3 @@ - #ifndef OBJECT_H #define OBJECT_H @@ -98,4 +97,4 @@ class Object : public Entity { void updateSounds(); }; -#endif +#endif \ No newline at end of file diff --git a/blitz3d/pivot.cpp b/blitz3d/pivot.cpp index 5fbc6bdd..f87f6d93 100644 --- a/blitz3d/pivot.cpp +++ b/blitz3d/pivot.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "pivot.h" @@ -7,4 +6,4 @@ Pivot::Pivot() { Pivot::Pivot(const Object& t) : Object(t) { -} +} \ No newline at end of file diff --git a/blitz3d/pivot.h b/blitz3d/pivot.h index e7f506f9..9ea42210 100644 --- a/blitz3d/pivot.h +++ b/blitz3d/pivot.h @@ -1,4 +1,3 @@ - #ifndef PIVOT_H #define PIVOT_H diff --git a/blitz3d/planemodel.cpp b/blitz3d/planemodel.cpp index 4bea4e21..b9fc15ee 100644 --- a/blitz3d/planemodel.cpp +++ b/blitz3d/planemodel.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "planemodel.h" #include "frustum.h" @@ -134,4 +133,4 @@ bool PlaneModel::collide(const Line& l, float radius, Collision* curr_coll, cons Vector n = (tf.m.cofactor() * p.n).normalized(); return curr_coll->update(l, t, n); -} +} \ No newline at end of file diff --git a/blitz3d/planemodel.h b/blitz3d/planemodel.h index 57af32be..49728555 100644 --- a/blitz3d/planemodel.h +++ b/blitz3d/planemodel.h @@ -1,4 +1,3 @@ - #ifndef PLANEMODEL_H #define PLANEMODEL_H diff --git a/blitz3d/q3bspmodel.cpp b/blitz3d/q3bspmodel.cpp index 68791fb8..fdd4498a 100644 --- a/blitz3d/q3bspmodel.cpp +++ b/blitz3d/q3bspmodel.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "q3bspmodel.h" #include "q3bsprep.h" diff --git a/blitz3d/q3bspmodel.h b/blitz3d/q3bspmodel.h index e20f37a7..e7774c2a 100644 --- a/blitz3d/q3bspmodel.h +++ b/blitz3d/q3bspmodel.h @@ -1,4 +1,3 @@ - #ifndef Q3BSPMODEL_H #define Q3BSPMODEL_H diff --git a/blitz3d/q3bsprep.cpp b/blitz3d/q3bsprep.cpp index 8d854019..cf58f135 100644 --- a/blitz3d/q3bsprep.cpp +++ b/blitz3d/q3bsprep.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "q3bsprep.h" @@ -762,4 +761,4 @@ void Q3BSPRep::setLighting(bool lmap) { s->brush.setTexture(1, tex, 0); } } -} +} \ No newline at end of file diff --git a/blitz3d/q3bsprep.h b/blitz3d/q3bsprep.h index 4e02e4df..b30bbe15 100644 --- a/blitz3d/q3bsprep.h +++ b/blitz3d/q3bsprep.h @@ -1,4 +1,3 @@ - #ifndef Q3BSPREP_H #define Q3BSPREP_H diff --git a/blitz3d/rendercontext.h b/blitz3d/rendercontext.h index 4bfab43f..5c1a0dd7 100644 --- a/blitz3d/rendercontext.h +++ b/blitz3d/rendercontext.h @@ -1,4 +1,3 @@ - #ifndef RENDERCONTEXT_H #define RENDERCONTEXT_H diff --git a/blitz3d/sprite.cpp b/blitz3d/sprite.cpp index 7e178998..aae37e24 100644 --- a/blitz3d/sprite.cpp +++ b/blitz3d/sprite.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "sprite.h" @@ -140,4 +139,4 @@ bool Sprite::render(const RenderContext& rc) { enqueue(mesh, fv, 4, ft, 2); return false; -} +} \ No newline at end of file diff --git a/blitz3d/sprite.h b/blitz3d/sprite.h index 516a49a4..1e265a04 100644 --- a/blitz3d/sprite.h +++ b/blitz3d/sprite.h @@ -1,4 +1,3 @@ - #ifndef SPRITE_H #define SPRITE_H diff --git a/blitz3d/std.cpp b/blitz3d/std.cpp index 7bc955da..66e8e905 100644 --- a/blitz3d/std.cpp +++ b/blitz3d/std.cpp @@ -1,2 +1 @@ - -#include "std.h" +#include "std.h" \ No newline at end of file diff --git a/blitz3d/std.h b/blitz3d/std.h index 585e33a8..d8418c3b 100644 --- a/blitz3d/std.h +++ b/blitz3d/std.h @@ -1,4 +1,3 @@ - #ifndef STD_H #define STD_H diff --git a/blitz3d/surface.cpp b/blitz3d/surface.cpp index 4b19f30d..0c744549 100644 --- a/blitz3d/surface.cpp +++ b/blitz3d/surface.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "surface.h" diff --git a/blitz3d/surface.h b/blitz3d/surface.h index 4f77f508..a1e96770 100644 --- a/blitz3d/surface.h +++ b/blitz3d/surface.h @@ -1,4 +1,3 @@ - #ifndef SURFACE_H #define SURFACE_H diff --git a/blitz3d/terrain.cpp b/blitz3d/terrain.cpp index 3294728a..6733493f 100644 --- a/blitz3d/terrain.cpp +++ b/blitz3d/terrain.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "terrain.h" #include "terrainrep.h" @@ -38,4 +37,4 @@ bool Terrain::render(const RenderContext& rc) { bool Terrain::collide(const Line& line, float radius, Collision* curr_coll, const Transform& tf) { return rep->collide(line, radius, curr_coll, tf); -} +} \ No newline at end of file diff --git a/blitz3d/terrain.h b/blitz3d/terrain.h index a65a98ac..6e82c93a 100644 --- a/blitz3d/terrain.h +++ b/blitz3d/terrain.h @@ -1,4 +1,3 @@ - #ifndef TERRAIN_H #define TERRAIN_H diff --git a/blitz3d/terrainrep.cpp b/blitz3d/terrainrep.cpp index bf973f74..b76576d9 100644 --- a/blitz3d/terrainrep.cpp +++ b/blitz3d/terrainrep.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "terrainrep.h" #include @@ -582,5 +581,4 @@ bool TerrainRep::collide(const Line& line, float radius, Collision* curr_coll, c return collide(line, radius, curr_coll, tform, 2, v1, v2, v0, box) | collide(line, radius, curr_coll, tform, 3, v3, v0, v2, box); -} - +} \ No newline at end of file diff --git a/blitz3d/terrainrep.h b/blitz3d/terrainrep.h index 7ac9c9c9..fec2f52d 100644 --- a/blitz3d/terrainrep.h +++ b/blitz3d/terrainrep.h @@ -1,4 +1,3 @@ - #ifndef TERRAINREP_H #define TERRAINREP_H diff --git a/blitz3d/texture.cpp b/blitz3d/texture.cpp index 5faaca48..37a2a772 100644 --- a/blitz3d/texture.cpp +++ b/blitz3d/texture.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "geom.h" #include "texture.h" @@ -222,4 +221,4 @@ void Texture::clearFilters() { void Texture::addFilter(const std::string& t, int flags) { filters.push_back(Filter(tolower(t), flags)); -} +} \ No newline at end of file diff --git a/blitz3d/texture.h b/blitz3d/texture.h index 42ce31bd..ab80c178 100644 --- a/blitz3d/texture.h +++ b/blitz3d/texture.h @@ -1,4 +1,3 @@ - #ifndef TEXTURE_H #define TEXTURE_H diff --git a/blitz3d/world.cpp b/blitz3d/world.cpp index 88e19816..cae60eae 100644 --- a/blitz3d/world.cpp +++ b/blitz3d/world.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include #include "world.h" @@ -518,4 +517,4 @@ void World::flushTransparent() { } mod->renderQueue(Model::QUEUE_TRANSPARENT); } -} +} \ No newline at end of file diff --git a/blitz3d/world.h b/blitz3d/world.h index 4f955a17..c4551cf9 100644 --- a/blitz3d/world.h +++ b/blitz3d/world.h @@ -1,4 +1,3 @@ - #ifndef WORLD_H #define WORLD_H @@ -53,4 +52,4 @@ class World { }; -#endif +#endif \ No newline at end of file diff --git a/blitzide/about.cpp b/blitzide/about.cpp index 01146d8c..d4964476 100644 --- a/blitzide/about.cpp +++ b/blitzide/about.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "prefs.h" #include "libs.h" @@ -94,5 +93,4 @@ void aboutBlitz() { about.wait(); about.EndDialog(0); AfxGetMainWnd()->EnableWindow(1); -} - +} \ No newline at end of file diff --git a/blitzide/about.h b/blitzide/about.h index c652d68e..54732860 100644 --- a/blitzide/about.h +++ b/blitzide/about.h @@ -1,4 +1,3 @@ - #ifndef ABOUT_H #define ABOUT_H diff --git a/blitzide/blitzide.cpp b/blitzide/blitzide.cpp index 8c29d48e..1dec49b5 100644 --- a/blitzide/blitzide.cpp +++ b/blitzide/blitzide.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "resource.h" #include "blitzide.h" @@ -35,4 +34,4 @@ BOOL BlitzIDE::InitInstance() { int BlitzIDE::ExitInstance() { prefs.close(); return 0; -} +} \ No newline at end of file diff --git a/blitzide/blitzide.h b/blitzide/blitzide.h index ac703cae..2e0d9226 100644 --- a/blitzide/blitzide.h +++ b/blitzide/blitzide.h @@ -1,4 +1,3 @@ - #ifndef BLITZIDE_H #define BLITZIDE_H diff --git a/blitzide/editor.cpp b/blitzide/editor.cpp index 86bd48b6..b084ff2d 100644 --- a/blitzide/editor.cpp +++ b/blitzide/editor.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "blitzide.h" #include "editor.h" @@ -878,4 +877,4 @@ void Editor::formatLine(int ln) { } } } -} +} \ No newline at end of file diff --git a/blitzide/editor.h b/blitzide/editor.h index a6d94475..9718eeeb 100644 --- a/blitzide/editor.h +++ b/blitzide/editor.h @@ -1,4 +1,3 @@ - #ifndef EDITOR_H #define EDITOR_H diff --git a/blitzide/funclist.cpp b/blitzide/funclist.cpp index c0711063..e237adcf 100644 --- a/blitzide/funclist.cpp +++ b/blitzide/funclist.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "funclist.h" @@ -69,4 +68,4 @@ void FuncList::relocate(int begin, int offset) { for(it = funcs.begin(); it != funcs.end(); ++it) { if(*it >= begin) *it += offset; } -} +} \ No newline at end of file diff --git a/blitzide/funclist.h b/blitzide/funclist.h index fbc08cdb..437f08a9 100644 --- a/blitzide/funclist.h +++ b/blitzide/funclist.h @@ -1,4 +1,3 @@ - #ifndef FUNCLIST_H #define FUNCLIST_H diff --git a/blitzide/htmlhelp.cpp b/blitzide/htmlhelp.cpp index 60a26a8f..94cefc78 100644 --- a/blitzide/htmlhelp.cpp +++ b/blitzide/htmlhelp.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "htmlhelp.h" #include "mainframe.h" @@ -42,5 +41,4 @@ void HtmlHelp::OnBeforeNavigate2(LPCTSTR url, DWORD flags, LPCTSTR target, CByte BOOL HtmlHelp::OnEraseBkgnd(CDC* dc) { return true; -} - +} \ No newline at end of file diff --git a/blitzide/htmlhelp.h b/blitzide/htmlhelp.h index dafb1d3d..662ca70d 100644 --- a/blitzide/htmlhelp.h +++ b/blitzide/htmlhelp.h @@ -1,4 +1,3 @@ - #ifndef HTMLHELP_H #define HTMLHELP_H @@ -43,4 +42,4 @@ class HtmlHelp : public CHtmlView { HelpListener* listener; }; -#endif +#endif \ No newline at end of file diff --git a/blitzide/libs.cpp b/blitzide/libs.cpp index 82736bbe..095245f6 100644 --- a/blitzide/libs.cpp +++ b/blitzide/libs.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "libs.h" #include "editor.h" @@ -121,4 +120,4 @@ bool isMediaFile(const std::string& f) { if(ext == t) return true; } return false; -} +} \ No newline at end of file diff --git a/blitzide/libs.h b/blitzide/libs.h index 251242ae..0bd84f86 100644 --- a/blitzide/libs.h +++ b/blitzide/libs.h @@ -1,4 +1,3 @@ - #ifndef LIBS_H #define LIBS_H @@ -8,4 +7,4 @@ void initLibs(); std::string quickHelp(const std::string& kw); bool isMediaFile(const std::string& file); -#endif +#endif \ No newline at end of file diff --git a/blitzide/mainframe.cpp b/blitzide/mainframe.cpp index df9bd625..731bcafd 100644 --- a/blitzide/mainframe.cpp +++ b/blitzide/mainframe.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "resource.h" #include "mainframe.h" @@ -997,4 +996,4 @@ void MainFrame::OnActivate(UINT state, CWnd* other, BOOL min) { void MainFrame::checkAndCreateDir(std::string dir) { CreateDirectory(dir.c_str(), 0); -} +} \ No newline at end of file diff --git a/blitzide/mainframe.h b/blitzide/mainframe.h index 68772d11..8b3e190a 100644 --- a/blitzide/mainframe.h +++ b/blitzide/mainframe.h @@ -1,4 +1,3 @@ - #ifndef MAINFRAME_H #define MAINFRAME_H @@ -108,4 +107,4 @@ class MainFrame : public CFrameWnd,public HelpListener,EditorListener,TabberList void helpTitleChange( HtmlHelp *help,const std::string &title ); }; -#endif +#endif \ No newline at end of file diff --git a/blitzide/prefs.cpp b/blitzide/prefs.cpp index 916800d5..a9f0ecaa 100644 --- a/blitzide/prefs.cpp +++ b/blitzide/prefs.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include #include @@ -202,4 +201,4 @@ void Prefs::createFonts() std::string Prefs::boolToString(bool value) { return value ? "true" : "false"; -} +} \ No newline at end of file diff --git a/blitzide/prefs.h b/blitzide/prefs.h index 5655f3c9..bb7d8e72 100644 --- a/blitzide/prefs.h +++ b/blitzide/prefs.h @@ -1,4 +1,3 @@ - #ifndef PREFS_H #define PREFS_H diff --git a/blitzide/stdafx.cpp b/blitzide/stdafx.cpp index b0e06dd0..2866a6c4 100644 --- a/blitzide/stdafx.cpp +++ b/blitzide/stdafx.cpp @@ -1,5 +1,2 @@ - #include "stdafx.h" - -#include "../stdutil/stdutil.cpp" - +#include "../stdutil/stdutil.cpp" \ No newline at end of file diff --git a/blitzide/stdafx.h b/blitzide/stdafx.h index 5ad09a9b..40b80329 100644 --- a/blitzide/stdafx.h +++ b/blitzide/stdafx.h @@ -1,4 +1,3 @@ - #ifndef STDAFX_H #define STDAFX_H diff --git a/blitzide/tabber.cpp b/blitzide/tabber.cpp index bee5756e..7e23a6eb 100644 --- a/blitzide/tabber.cpp +++ b/blitzide/tabber.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "tabber.h" diff --git a/blitzide/tabber.h b/blitzide/tabber.h index 75102b04..df06031f 100644 --- a/blitzide/tabber.h +++ b/blitzide/tabber.h @@ -1,4 +1,3 @@ - #ifndef TABBER_H #define TABBER_H @@ -53,4 +52,4 @@ class Tabber : public CTabCtrl { Tab* getTab(int index)const; }; -#endif +#endif \ No newline at end of file diff --git a/compiler/assem.h b/compiler/assem.h index 231b60eb..8a5a15c1 100644 --- a/compiler/assem.h +++ b/compiler/assem.h @@ -1,4 +1,3 @@ - #ifndef ASSEM_H #define ASSEM_H diff --git a/compiler/assem_x86/asm_insts.cpp b/compiler/assem_x86/asm_insts.cpp index b828025a..9de97366 100644 --- a/compiler/assem_x86/asm_insts.cpp +++ b/compiler/assem_x86/asm_insts.cpp @@ -582,4 +582,4 @@ Inst insts[] = { 0,R_M16,IMM8,O16 | _6 | IB,"\x1\x83", 0,R_M32,IMM8,O32 | _6 | IB,"\x1\x83", "",0,0,0,0 -}; +}; \ No newline at end of file diff --git a/compiler/assem_x86/assem_x86.cpp b/compiler/assem_x86/assem_x86.cpp index 9aa3e14a..6c2a0715 100644 --- a/compiler/assem_x86/assem_x86.cpp +++ b/compiler/assem_x86/assem_x86.cpp @@ -1,10 +1,6 @@ - /* - BlitzPC assembler. - This REALLY needs some work - very slow. - */ #include "../std.h" @@ -317,4 +313,4 @@ void Assem_x86::assemble() { throw Ex(line + x.ex); } } -} +} \ No newline at end of file diff --git a/compiler/assem_x86/assem_x86.h b/compiler/assem_x86/assem_x86.h index a995350c..30119958 100644 --- a/compiler/assem_x86/assem_x86.h +++ b/compiler/assem_x86/assem_x86.h @@ -1,4 +1,3 @@ - #ifndef ASSEM_X86_H #define ASSEM_X86_H @@ -33,4 +32,4 @@ class Assem_x86 : public Assem { void assemLine(const std::string& line); }; -#endif +#endif \ No newline at end of file diff --git a/compiler/assem_x86/insts.h b/compiler/assem_x86/insts.h index 23783a08..9f5a7d32 100644 --- a/compiler/assem_x86/insts.h +++ b/compiler/assem_x86/insts.h @@ -1,4 +1,3 @@ - #ifndef INSTS_H #define INSTS_H @@ -34,4 +33,4 @@ struct Inst { extern Inst insts[]; -#endif +#endif \ No newline at end of file diff --git a/compiler/assem_x86/operand.cpp b/compiler/assem_x86/operand.cpp index d9790da8..faa14f5f 100644 --- a/compiler/assem_x86/operand.cpp +++ b/compiler/assem_x86/operand.cpp @@ -1,4 +1,3 @@ - #include "../std.h" #include "../ex.h" #include "operand.h" @@ -170,4 +169,4 @@ void Operand::parse() { if(!s.size()) return; } opError(); -} +} \ No newline at end of file diff --git a/compiler/assem_x86/operand.h b/compiler/assem_x86/operand.h index b6ddcd15..116cd788 100644 --- a/compiler/assem_x86/operand.h +++ b/compiler/assem_x86/operand.h @@ -1,4 +1,3 @@ - #ifndef OPERAND_H #define OPERAND_H @@ -27,4 +26,4 @@ struct Operand { bool parseConst(int* iconst); }; -#endif +#endif \ No newline at end of file diff --git a/compiler/codegen.h b/compiler/codegen.h index 32043681..b562dc67 100644 --- a/compiler/codegen.h +++ b/compiler/codegen.h @@ -1,4 +1,3 @@ - #ifndef CODEGEN_H #define CODEGEN_H diff --git a/compiler/codegen_x86/codegen_x86.cpp b/compiler/codegen_x86/codegen_x86.cpp index 7f6b9b6f..b2dc2582 100644 --- a/compiler/codegen_x86/codegen_x86.cpp +++ b/compiler/codegen_x86/codegen_x86.cpp @@ -1,4 +1,3 @@ - #include "../std.h" #include "codegen_x86.h" #include "tile.h" @@ -516,4 +515,4 @@ Tile* Codegen_x86::munchFP(TNode* t) { q = new Tile(s, q); } return q; -} +} \ No newline at end of file diff --git a/compiler/codegen_x86/codegen_x86.h b/compiler/codegen_x86/codegen_x86.h index 4caa7551..e59c03d3 100644 --- a/compiler/codegen_x86/codegen_x86.h +++ b/compiler/codegen_x86/codegen_x86.h @@ -1,4 +1,3 @@ - #include "../codegen.h" struct Tile; diff --git a/compiler/codegen_x86/tile.cpp b/compiler/codegen_x86/tile.cpp index c3650408..77109339 100644 --- a/compiler/codegen_x86/tile.cpp +++ b/compiler/codegen_x86/tile.cpp @@ -1,4 +1,3 @@ - #include "../std.h" #include "codegen_x86.h" #include "tile.h" @@ -276,4 +275,4 @@ void Codegen_x86::s_data(const std::string& s, const std::string& l) { void Codegen_x86::p_data(const std::string& p, const std::string& l) { if(l.size()) dataFrags.push_back(l); dataFrags.push_back(std::string("\t.dd\t") + p + '\n'); -} +} \ No newline at end of file diff --git a/compiler/codegen_x86/tile.h b/compiler/codegen_x86/tile.h index 22c2fc70..2181007e 100644 --- a/compiler/codegen_x86/tile.h +++ b/compiler/codegen_x86/tile.h @@ -1,4 +1,3 @@ - #ifndef TILE_H #define TILE_H @@ -23,4 +22,4 @@ struct Tile { }; -#endif +#endif \ No newline at end of file diff --git a/compiler/decl.cpp b/compiler/decl.cpp index 99405711..e1b7a3ae 100644 --- a/compiler/decl.cpp +++ b/compiler/decl.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "decl.h" #include "type.h" @@ -31,5 +30,4 @@ Decl* DeclSeq::insertDecl(const std::string& s, Type* t, int kind, ConstType* d) if(findDecl(s)) return 0; decls.push_back(new Decl(s, t, kind, d)); return decls.back(); -} - +} \ No newline at end of file diff --git a/compiler/decl.h b/compiler/decl.h index 8dfb989d..62ae8fdc 100644 --- a/compiler/decl.h +++ b/compiler/decl.h @@ -1,4 +1,3 @@ - #ifndef DECL_H #define DECL_H @@ -30,4 +29,4 @@ struct DeclSeq { int size() { return decls.size(); } }; -#endif +#endif \ No newline at end of file diff --git a/compiler/declnode.cpp b/compiler/declnode.cpp index d9874aa2..b791fb1b 100644 --- a/compiler/declnode.cpp +++ b/compiler/declnode.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "nodes.h" @@ -281,4 +280,4 @@ void VectorDeclNode::translate(Codegen* g) { g->p_data(t); if(kind == DECL_GLOBAL) g->i_data(0, "_v" + ident); -} +} \ No newline at end of file diff --git a/compiler/declnode.h b/compiler/declnode.h index 52bdb951..19c0beba 100644 --- a/compiler/declnode.h +++ b/compiler/declnode.h @@ -1,4 +1,3 @@ - #ifndef DECLNODE_H #define DECLNODE_H @@ -87,4 +86,4 @@ struct VectorDeclNode : public DeclNode { void translate(Codegen* g); }; -#endif +#endif \ No newline at end of file diff --git a/compiler/environ.cpp b/compiler/environ.cpp index 12f1b1aa..55e07e10 100644 --- a/compiler/environ.cpp +++ b/compiler/environ.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "environ.h" @@ -65,4 +64,4 @@ Label* Environ::insertLabel(const std::string& s, int def, int src, int sz) { std::string Environ::setBreak(const std::string& s) { std::string t = breakLabel; breakLabel = s; return t; -} +} \ No newline at end of file diff --git a/compiler/environ.h b/compiler/environ.h index 5f0e6e41..78809c9a 100644 --- a/compiler/environ.h +++ b/compiler/environ.h @@ -1,9 +1,6 @@ - /* - An environ represent a stack frame block. - - */ +*/ #ifndef ENVIRON_H #define ENVIRON_H @@ -39,4 +36,4 @@ class Environ { std::string setBreak(const std::string& s); }; -#endif +#endif \ No newline at end of file diff --git a/compiler/ex.h b/compiler/ex.h index e913270a..7fa37fb0 100644 --- a/compiler/ex.h +++ b/compiler/ex.h @@ -1,4 +1,3 @@ - #ifndef EX_H #define EX_H diff --git a/compiler/exprnode.cpp b/compiler/exprnode.cpp index fd4fd345..e7a63e26 100644 --- a/compiler/exprnode.cpp +++ b/compiler/exprnode.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "nodes.h" @@ -736,4 +735,4 @@ ExprNode* ObjectHandleNode::semant(Environ* e) { TNode* ObjectHandleNode::translate(Codegen* g) { TNode* t = expr->translate(g); return call("__bbObjToHandle", t); -} +} \ No newline at end of file diff --git a/compiler/exprnode.h b/compiler/exprnode.h index 8c6c7f02..1bd6a1f3 100644 --- a/compiler/exprnode.h +++ b/compiler/exprnode.h @@ -1,4 +1,3 @@ - #ifndef EXPRNODE_H #define EXPRNODE_H @@ -191,4 +190,4 @@ struct ObjectHandleNode : public ExprNode { TNode* translate(Codegen* g); }; -#endif +#endif \ No newline at end of file diff --git a/compiler/label.h b/compiler/label.h index 767cb83b..18eb9104 100644 --- a/compiler/label.h +++ b/compiler/label.h @@ -1,4 +1,3 @@ - #ifndef LABEL_H #define LABEL_H diff --git a/compiler/node.cpp b/compiler/node.cpp index aaab1f72..3a97d438 100644 --- a/compiler/node.cpp +++ b/compiler/node.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "nodes.h" @@ -287,5 +286,4 @@ TNode* Node::jumpf(TNode* expr, const std::string& s) { TNode* Node::jumpge(TNode* l, TNode* r, const std::string& s) { return new TNode(IR_JUMPGE, l, r, s); -} - +} \ No newline at end of file diff --git a/compiler/node.h b/compiler/node.h index 4c9b269e..43794fc5 100644 --- a/compiler/node.h +++ b/compiler/node.h @@ -1,4 +1,3 @@ - #ifndef NODE_H #define NODE_H @@ -53,4 +52,4 @@ struct Node { static TNode* fcall(const std::string& func, TNode* a0 = 0, TNode* a1 = 0, TNode* a2 = 0); }; -#endif +#endif \ No newline at end of file diff --git a/compiler/nodes.h b/compiler/nodes.h index c2d75c5f..c008b40b 100644 --- a/compiler/nodes.h +++ b/compiler/nodes.h @@ -1,4 +1,3 @@ - #ifndef NODES_H #define NODES_H @@ -7,4 +6,4 @@ #include "declnode.h" #include "prognode.h" -#endif +#endif \ No newline at end of file diff --git a/compiler/parser.cpp b/compiler/parser.cpp index 4e3a992b..0aca30fb 100644 --- a/compiler/parser.cpp +++ b/compiler/parser.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include #include "parser.h" @@ -775,4 +774,4 @@ ExprNode* Parser::parsePrimary(bool opt) { if(!opt) exp("expression"); } return result; -} +} \ No newline at end of file diff --git a/compiler/parser.h b/compiler/parser.h index a2a2e33d..ac05d54b 100644 --- a/compiler/parser.h +++ b/compiler/parser.h @@ -1,8 +1,5 @@ - /* - The parser builds an abstact syntax tree from input tokens. - */ #ifndef PARSER_H @@ -62,4 +59,4 @@ class Parser { ExprNode* parsePrimary(bool opt); }; -#endif +#endif \ No newline at end of file diff --git a/compiler/prognode.cpp b/compiler/prognode.cpp index 8a123068..db9b172f 100644 --- a/compiler/prognode.cpp +++ b/compiler/prognode.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "nodes.h" @@ -135,4 +134,4 @@ void ProgNode::translate(Codegen* g, const std::vector& usrfuncs) { //Thats IT! g->flush(); -} +} \ No newline at end of file diff --git a/compiler/prognode.h b/compiler/prognode.h index 25364f6a..ff5c0d8d 100644 --- a/compiler/prognode.h +++ b/compiler/prognode.h @@ -1,4 +1,3 @@ - #ifndef PROGNODE_H #define PROGNODE_H diff --git a/compiler/std.cpp b/compiler/std.cpp index 7bc955da..66e8e905 100644 --- a/compiler/std.cpp +++ b/compiler/std.cpp @@ -1,2 +1 @@ - -#include "std.h" +#include "std.h" \ No newline at end of file diff --git a/compiler/std.h b/compiler/std.h index 1d403bff..47d521aa 100644 --- a/compiler/std.h +++ b/compiler/std.h @@ -1,4 +1,3 @@ - #ifndef STD_COMPILER_H #define STD_COMPILER_H diff --git a/compiler/stmtnode.cpp b/compiler/stmtnode.cpp index 1e4a619c..2dcbf791 100644 --- a/compiler/stmtnode.cpp +++ b/compiler/stmtnode.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "nodes.h" @@ -592,5 +591,4 @@ void ReadNode::translate(Codegen* g) { else if(var->sem_type == Type::float_type) t = fcall("__bbReadFloat"); else t = call("__bbReadStr"); g->code(var->store(g, t)); -} - +} \ No newline at end of file diff --git a/compiler/stmtnode.h b/compiler/stmtnode.h index 77a58a90..89452fce 100644 --- a/compiler/stmtnode.h +++ b/compiler/stmtnode.h @@ -1,4 +1,3 @@ - #ifndef STMTNODE_H #define STMTNODE_H @@ -226,4 +225,4 @@ struct RestoreNode : public StmtNode { void translate(Codegen* g); }; -#endif +#endif \ No newline at end of file diff --git a/compiler/toker.cpp b/compiler/toker.cpp index 31607167..98d8ea2c 100644 --- a/compiler/toker.cpp +++ b/compiler/toker.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include #include "toker.h" @@ -263,4 +262,4 @@ int Toker::next() { if(++curr_toke == tokes.size()) nextline(); return curr(); -} +} \ No newline at end of file diff --git a/compiler/toker.h b/compiler/toker.h index 04593ded..5fb88d62 100644 --- a/compiler/toker.h +++ b/compiler/toker.h @@ -1,9 +1,6 @@ - /* - The Toker converts an inout stream into tokens for use by the parser. - - */ +*/ #ifndef TOKER_H #define TOKER_H @@ -58,4 +55,4 @@ class Toker { int curr_row, curr_toke; }; -#endif +#endif \ No newline at end of file diff --git a/compiler/type.cpp b/compiler/type.cpp index 4fa45a2d..cd4fb0cb 100644 --- a/compiler/type.cpp +++ b/compiler/type.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "type.h" @@ -61,4 +60,4 @@ Type* Type::void_type = &v; Type* Type::int_type = &i; Type* Type::float_type = &f; Type* Type::string_type = &s; -Type* Type::null_type = &n; +Type* Type::null_type = &n; \ No newline at end of file diff --git a/compiler/type.h b/compiler/type.h index 4e51e800..035e9eba 100644 --- a/compiler/type.h +++ b/compiler/type.h @@ -1,4 +1,3 @@ - #ifndef TYPE_H #define TYPE_H @@ -84,4 +83,4 @@ struct VectorType : public Type { std::string name() { return elementType->name() + " vector"; } }; -#endif +#endif \ No newline at end of file diff --git a/compiler/varnode.cpp b/compiler/varnode.cpp index dea80b88..fad9afa0 100644 --- a/compiler/varnode.cpp +++ b/compiler/varnode.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "nodes.h" @@ -158,4 +157,4 @@ TNode* VectorVarNode::translate(Codegen* g) { t = t ? add(t, p) : p; } return add(t, expr->translate(g)); -} +} \ No newline at end of file diff --git a/compiler/varnode.h b/compiler/varnode.h index 7330ccdc..187e29d4 100644 --- a/compiler/varnode.h +++ b/compiler/varnode.h @@ -1,4 +1,3 @@ - #ifndef VARNODE_H #define VARNODE_H @@ -64,4 +63,4 @@ struct VectorVarNode : public VarNode { TNode* translate(Codegen* g); }; -#endif +#endif \ No newline at end of file diff --git a/config/config.h b/config/config.h index 2f0497e4..ff433d0a 100644 --- a/config/config.h +++ b/config/config.h @@ -1,4 +1,3 @@ - #ifndef CONFIG_H #define CONFIG_H @@ -7,4 +6,4 @@ #define VERSION (BASE_VER|PRO_F) #define OPENCC -#endif +#endif \ No newline at end of file diff --git a/debugger/debugger.h b/debugger/debugger.h index f48740b4..a8bb54c9 100644 --- a/debugger/debugger.h +++ b/debugger/debugger.h @@ -1,4 +1,3 @@ - #ifndef DEBUGGER_H #define DEBUGGER_H @@ -16,4 +15,4 @@ class Debugger { extern "C" _declspec(dllexport) Debugger * _cdecl debuggerGetDebugger(void* mod, void* env); -#endif +#endif \ No newline at end of file diff --git a/debugger/debuggerapp.cpp b/debugger/debuggerapp.cpp index a754186a..93d7c520 100644 --- a/debugger/debuggerapp.cpp +++ b/debugger/debuggerapp.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "debugger.h" #include "debuggerapp.h" diff --git a/debugger/debuggerapp.h b/debugger/debuggerapp.h index ae6430bd..7af0be7b 100644 --- a/debugger/debuggerapp.h +++ b/debugger/debuggerapp.h @@ -1,4 +1,3 @@ - #ifndef DEBUGGERAPP_H #define DEBUGGERAPP_H diff --git a/debugger/debugtree.cpp b/debugger/debugtree.cpp index b02eec79..113dab80 100644 --- a/debugger/debugtree.cpp +++ b/debugger/debugtree.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "debugtree.h" #include "prefs.h" @@ -250,5 +249,4 @@ void LocalsTree::pushFrame(void* f, void* e, const char* func) { void LocalsTree::popFrame() { frames.pop_back(); -} - +} \ No newline at end of file diff --git a/debugger/debugtree.h b/debugger/debugtree.h index 2182f307..7fc19474 100644 --- a/debugger/debugtree.h +++ b/debugger/debugtree.h @@ -1,4 +1,3 @@ - #ifndef DEBUGTREE_H #define DEBUGTREE_H diff --git a/debugger/mainframe.cpp b/debugger/mainframe.cpp index ad7cdcb4..98a9cac5 100644 --- a/debugger/mainframe.cpp +++ b/debugger/mainframe.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "mainframe.h" #include "resource.h" @@ -328,4 +327,4 @@ void MainFrame::OnWindowPosChanging(WINDOWPOS* pos) { pos->x = rect.left; pos->cx = rect.right - pos->x; pos->cy = rect.bottom - pos->y; -} +} \ No newline at end of file diff --git a/debugger/mainframe.h b/debugger/mainframe.h index dde8dae8..10a78de3 100644 --- a/debugger/mainframe.h +++ b/debugger/mainframe.h @@ -1,4 +1,3 @@ - #ifndef MAINFRAME_H #define MAINFRAME_H @@ -61,4 +60,4 @@ class MainFrame : public CFrameWnd, public Debugger { afx_msg void OnWindowPosChanging(WINDOWPOS* pos); }; -#endif +#endif \ No newline at end of file diff --git a/debugger/prefs.cpp b/debugger/prefs.cpp index 36ed4323..6bb9f7c6 100644 --- a/debugger/prefs.cpp +++ b/debugger/prefs.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include #include @@ -154,4 +153,4 @@ void Prefs::createFonts() { std::string Prefs::boolToString(bool value) { return value ? "true" : "false"; -} +} \ No newline at end of file diff --git a/debugger/prefs.h b/debugger/prefs.h index 313462fd..38f87c89 100644 --- a/debugger/prefs.h +++ b/debugger/prefs.h @@ -1,4 +1,3 @@ - #ifndef PREFS_H #define PREFS_H @@ -45,4 +44,4 @@ class Prefs { extern Prefs prefs; -#endif +#endif \ No newline at end of file diff --git a/debugger/sourcefile.cpp b/debugger/sourcefile.cpp index b9cc7e7b..7af38f37 100644 --- a/debugger/sourcefile.cpp +++ b/debugger/sourcefile.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "sourcefile.h" #include "prefs.h" @@ -48,4 +47,4 @@ void SourceFile::highLight(int row, int col) { } HideSelection(false, false); SetSel(pos, end); -} +} \ No newline at end of file diff --git a/debugger/sourcefile.h b/debugger/sourcefile.h index 2935f388..d4d54993 100644 --- a/debugger/sourcefile.h +++ b/debugger/sourcefile.h @@ -1,4 +1,3 @@ - #ifndef SOURCEFILE_H #define SOURCEFILE_H diff --git a/debugger/stdafx.cpp b/debugger/stdafx.cpp index 46cd1889..1577c4e3 100644 --- a/debugger/stdafx.cpp +++ b/debugger/stdafx.cpp @@ -1,2 +1 @@ - -#include "stdafx.h" +#include "stdafx.h" \ No newline at end of file diff --git a/debugger/stdafx.h b/debugger/stdafx.h index 7527cdbb..05f0468e 100644 --- a/debugger/stdafx.h +++ b/debugger/stdafx.h @@ -1,4 +1,3 @@ - #ifndef STDAFX_H #define STDAFX_H diff --git a/debugger/stdutil.cpp b/debugger/stdutil.cpp index 9276ff89..8651d811 100644 --- a/debugger/stdutil.cpp +++ b/debugger/stdutil.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" int atoi(const std::string& s) { @@ -105,4 +104,4 @@ std::string filenamefile(const std::string& t) { GetFullPathName(t.c_str(), MAX_PATH, buff, &p); if(!p) return ""; return std::string(p); -} +} \ No newline at end of file diff --git a/debugger/tabber.cpp b/debugger/tabber.cpp index c0d55164..c58f7dd0 100644 --- a/debugger/tabber.cpp +++ b/debugger/tabber.cpp @@ -1,4 +1,3 @@ - #include "stdafx.h" #include "tabber.h" diff --git a/debugger/tabber.h b/debugger/tabber.h index 75102b04..df06031f 100644 --- a/debugger/tabber.h +++ b/debugger/tabber.h @@ -1,4 +1,3 @@ - #ifndef TABBER_H #define TABBER_H @@ -53,4 +52,4 @@ class Tabber : public CTabCtrl { Tab* getTab(int index)const; }; -#endif +#endif \ No newline at end of file diff --git a/freeimage/FreeImage/BitmapAccess.cpp b/freeimage/FreeImage/BitmapAccess.cpp index 5c514265..3ca2603f 100644 --- a/freeimage/FreeImage/BitmapAccess.cpp +++ b/freeimage/FreeImage/BitmapAccess.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Floris van den Berg (flvdberg@wxs.nl) -// - Hervé Drolon (drolon@iut.univ-lehavre.fr) +// - Herv?Drolon (drolon@iut.univ-lehavre.fr) // // This file is part of FreeImage 2 // diff --git a/gxruntime/ddutil.cpp b/gxruntime/ddutil.cpp index 169a6b37..a244012c 100644 --- a/gxruntime/ddutil.cpp +++ b/gxruntime/ddutil.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "ddutil.h" #include "asmcoder.h" @@ -520,4 +519,4 @@ ddSurf* ddUtil::loadSurface(const std::string& f, int flags, gxGraphics* gfx) { FreeImage_Unload(dib); FreeImage_DeInitialise(); return dest; -} +} \ No newline at end of file diff --git a/gxruntime/ddutil.h b/gxruntime/ddutil.h index 3b4276b8..8097c1c9 100644 --- a/gxruntime/ddutil.h +++ b/gxruntime/ddutil.h @@ -1,4 +1,3 @@ - #ifndef DDUTIL_H #define DDUTIL_H diff --git a/gxruntime/gxaudio.cpp b/gxruntime/gxaudio.cpp index 3453a95f..12996a29 100644 --- a/gxruntime/gxaudio.cpp +++ b/gxruntime/gxaudio.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxaudio.h" @@ -273,4 +272,4 @@ gxChannel* gxAudio::playFile(const std::string& t, bool use_3d, int mode) { gxChannel* gxAudio::playCDTrack(int track, int mode) { cdChannel->play(track, mode); return cdChannel; -} +} \ No newline at end of file diff --git a/gxruntime/gxaudio.h b/gxruntime/gxaudio.h index 4d9387be..1c367771 100644 --- a/gxruntime/gxaudio.h +++ b/gxruntime/gxaudio.h @@ -1,4 +1,3 @@ - #ifndef GXAUDIO_H #define GXAUDIO_H diff --git a/gxruntime/gxcanvas.cpp b/gxruntime/gxcanvas.cpp index 6e745179..10f20724 100644 --- a/gxruntime/gxcanvas.cpp +++ b/gxruntime/gxcanvas.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxcanvas.h" #include "gxgraphics.h" diff --git a/gxruntime/gxcanvas.h b/gxruntime/gxcanvas.h index b11975e7..b20488e1 100644 --- a/gxruntime/gxcanvas.h +++ b/gxruntime/gxcanvas.h @@ -1,4 +1,3 @@ - #ifndef GXCANVAS_H #define GXCANVAS_H diff --git a/gxruntime/gxchannel.cpp b/gxruntime/gxchannel.cpp index 5f9a8802..45d9d3ed 100644 --- a/gxruntime/gxchannel.cpp +++ b/gxruntime/gxchannel.cpp @@ -1,6 +1,5 @@ - #include "std.h" #include "gxchannel.h" gxChannel::~gxChannel() { -} +} \ No newline at end of file diff --git a/gxruntime/gxchannel.h b/gxruntime/gxchannel.h index 5e35ea65..a8a5d7f8 100644 --- a/gxruntime/gxchannel.h +++ b/gxruntime/gxchannel.h @@ -1,4 +1,3 @@ - #ifndef GXCHANNEL_H #define GXCHANNEL_H diff --git a/gxruntime/gxdevice.cpp b/gxruntime/gxdevice.cpp index a6c2eb05..82452cde 100644 --- a/gxruntime/gxdevice.cpp +++ b/gxruntime/gxdevice.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxdevice.h" #include "gxruntime.h" @@ -59,4 +58,4 @@ int gxDevice::getKey() { float gxDevice::getAxisState(int axis) { update(); return axis_states[axis]; -} +} \ No newline at end of file diff --git a/gxruntime/gxdevice.h b/gxruntime/gxdevice.h index 4bd384bc..6d98d86d 100644 --- a/gxruntime/gxdevice.h +++ b/gxruntime/gxdevice.h @@ -1,4 +1,3 @@ - #ifndef GXDEVICE_H #define GXDEVICE_H diff --git a/gxruntime/gxdir.cpp b/gxruntime/gxdir.cpp index 5163aff0..17cc3b4b 100644 --- a/gxruntime/gxdir.cpp +++ b/gxruntime/gxdir.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxdir.h" diff --git a/gxruntime/gxdir.h b/gxruntime/gxdir.h index 9acc4fdd..7c272b99 100644 --- a/gxruntime/gxdir.h +++ b/gxruntime/gxdir.h @@ -1,4 +1,3 @@ - #ifndef GXDIR_H #define GXDIR_H diff --git a/gxruntime/gxfilesystem.cpp b/gxruntime/gxfilesystem.cpp index 9c696701..d6f92357 100644 --- a/gxruntime/gxfilesystem.cpp +++ b/gxruntime/gxfilesystem.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxfilesystem.h" @@ -59,11 +58,6 @@ std::string gxFileSystem::getCurrentDir()const { } int gxFileSystem::getFileSize(const std::string& name)const { - /*WIN32_FIND_DATA findData; - HANDLE h=FindFirstFile( name.c_str(),&findData ); - if( h==INVALID_HANDLE_VALUE ) return 0; - int n=findData.dwFileAttributes,sz=findData.nFileSizeLow; - FindClose( h );return n & FILE_ATTRIBUTE_DIRECTORY ? 0 : sz;*/ return std::filesystem::file_size(name); } @@ -92,4 +86,4 @@ gxDir* gxFileSystem::verifyDir(gxDir* d) { void gxFileSystem::closeDir(gxDir* d) { if(dir_set.erase(d)) delete d; -} +} \ No newline at end of file diff --git a/gxruntime/gxfilesystem.h b/gxruntime/gxfilesystem.h index dd6acca9..86d0478c 100644 --- a/gxruntime/gxfilesystem.h +++ b/gxruntime/gxfilesystem.h @@ -1,4 +1,3 @@ - #ifndef GXFILESYSTEM_H #define GXFILESYSTEM_H diff --git a/gxruntime/gxfont.cpp b/gxruntime/gxfont.cpp index e8037612..25d34e8d 100644 --- a/gxruntime/gxfont.cpp +++ b/gxruntime/gxfont.cpp @@ -253,4 +253,4 @@ int gxFont::getWidth(const std::string& text) { bool gxFont::isPrintable(int chr)const { return glyphData.find(chr) != glyphData.end(); -} +} \ No newline at end of file diff --git a/gxruntime/gxfont.h b/gxruntime/gxfont.h index 3d9613a2..f19ff570 100644 --- a/gxruntime/gxfont.h +++ b/gxruntime/gxfont.h @@ -66,4 +66,4 @@ class gxFont { std::string filename; }; -#endif +#endif \ No newline at end of file diff --git a/gxruntime/gxgraphics.cpp b/gxruntime/gxgraphics.cpp index 980527e4..48f2e873 100644 --- a/gxruntime/gxgraphics.cpp +++ b/gxruntime/gxgraphics.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxgraphics.h" #include "gxruntime.h" @@ -505,4 +504,4 @@ gxMesh* gxGraphics::verifyMesh(gxMesh* m) { void gxGraphics::freeMesh(gxMesh* mesh) { if(mesh_set.erase(mesh)) delete mesh; -} +} \ No newline at end of file diff --git a/gxruntime/gxgraphics.h b/gxruntime/gxgraphics.h index dd1c7868..2e4eff26 100644 --- a/gxruntime/gxgraphics.h +++ b/gxruntime/gxgraphics.h @@ -1,4 +1,3 @@ - #ifndef GXGRAPHICS_H #define GXGRAPHICS_H diff --git a/gxruntime/gxinput.cpp b/gxruntime/gxinput.cpp index 0c1e7e55..413f0844 100644 --- a/gxruntime/gxinput.cpp +++ b/gxruntime/gxinput.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxinput.h" #include "gxruntime.h" @@ -362,4 +361,4 @@ int gxInput::toAscii(int scan)const { WORD ch; if(ToAscii(virt, scan, mat, &ch, 0) != 1) return 0; return ch & 255; -} +} \ No newline at end of file diff --git a/gxruntime/gxinput.h b/gxruntime/gxinput.h index af19fbec..548624e5 100644 --- a/gxruntime/gxinput.h +++ b/gxruntime/gxinput.h @@ -1,4 +1,3 @@ - #ifndef GXINPUT_H #define GXINPUT_H diff --git a/gxruntime/gxlight.cpp b/gxruntime/gxlight.cpp index b64a03bc..d6b7841d 100644 --- a/gxruntime/gxlight.cpp +++ b/gxruntime/gxlight.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxlight.h" #include "gxscene.h" @@ -58,4 +57,4 @@ void gxLight::setDirection(const float dir[3]) { void gxLight::setConeAngles(float inner, float outer) { d3d_light.dvTheta = inner; d3d_light.dvPhi = outer; -} +} \ No newline at end of file diff --git a/gxruntime/gxlight.h b/gxruntime/gxlight.h index d2008799..9ff2f734 100644 --- a/gxruntime/gxlight.h +++ b/gxruntime/gxlight.h @@ -1,4 +1,3 @@ - #ifndef GXLIGHT_H #define GXLIGHT_H diff --git a/gxruntime/gxmesh.cpp b/gxruntime/gxmesh.cpp index 86f8062c..c5d541d3 100644 --- a/gxruntime/gxmesh.cpp +++ b/gxruntime/gxmesh.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxmesh.h" #include "gxgraphics.h" @@ -62,4 +61,4 @@ void gxMesh::render(int first_vert, int vert_cnt, int first_tri, int tri_cnt) { D3DPT_TRIANGLELIST, vertex_buff, first_vert, vert_cnt, tri_indices + first_tri * 3, tri_cnt * 3, 0); -} +} \ No newline at end of file diff --git a/gxruntime/gxmesh.h b/gxruntime/gxmesh.h index b8ae5e8f..ef5f8ba0 100644 --- a/gxruntime/gxmesh.h +++ b/gxruntime/gxmesh.h @@ -1,4 +1,3 @@ - #ifndef GXMESH_H #define GXMESH_H diff --git a/gxruntime/gxmovie.cpp b/gxruntime/gxmovie.cpp index 5d40a737..78afcce5 100644 --- a/gxruntime/gxmovie.cpp +++ b/gxruntime/gxmovie.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxmovie.h" #include "gxgraphics.h" @@ -46,4 +45,4 @@ bool gxMovie::draw(gxCanvas* dest, int x, int y, int w, int h) { playing = false; } return playing; -} +} \ No newline at end of file diff --git a/gxruntime/gxmovie.h b/gxruntime/gxmovie.h index b637aaf5..bfbd16cd 100644 --- a/gxruntime/gxmovie.h +++ b/gxruntime/gxmovie.h @@ -1,4 +1,3 @@ - #ifndef GXMOVIE_H #define GXMOVIE_H diff --git a/gxruntime/gxruntime.cpp b/gxruntime/gxruntime.cpp index 92ef94bd..6c24171b 100644 --- a/gxruntime/gxruntime.cpp +++ b/gxruntime/gxruntime.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxruntime.h" #include "zmouse.h" @@ -1341,4 +1340,4 @@ int gxRuntime::callDll(const std::string& dll, const std::string& func, const vo }; return n; -} +} \ No newline at end of file diff --git a/gxruntime/gxruntime.h b/gxruntime/gxruntime.h index b78d7afe..9d4e5300 100644 --- a/gxruntime/gxruntime.h +++ b/gxruntime/gxruntime.h @@ -1,4 +1,3 @@ - #ifndef GXRUNTIME_H #define GXRUNTIME_H diff --git a/gxruntime/gxscene.cpp b/gxruntime/gxscene.cpp index e4cabc5a..fa7b571c 100644 --- a/gxruntime/gxscene.cpp +++ b/gxruntime/gxscene.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxscene.h" #include "gxgraphics.h" @@ -703,4 +702,4 @@ void gxScene::freeLight(gxLight* l) { int gxScene::getTrianglesDrawn()const { return tris_drawn; -} +} \ No newline at end of file diff --git a/gxruntime/gxscene.h b/gxruntime/gxscene.h index d92afece..3b4046ea 100644 --- a/gxruntime/gxscene.h +++ b/gxruntime/gxscene.h @@ -1,4 +1,3 @@ - #ifndef GXSCENE_H #define GXSCENE_H diff --git a/gxruntime/gxsound.cpp b/gxruntime/gxsound.cpp index 8749c8b8..fc76e44b 100644 --- a/gxruntime/gxsound.cpp +++ b/gxruntime/gxsound.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxsound.h" #include "gxaudio.h" @@ -46,5 +45,4 @@ void gxSound::setVolume(float volume) { void gxSound::setPan(float pan) { def_pan = (pan + 1.0f) * 127.5f; defs_valid = false; -} - +} \ No newline at end of file diff --git a/gxruntime/gxsound.h b/gxruntime/gxsound.h index 4655d691..a96f593e 100644 --- a/gxruntime/gxsound.h +++ b/gxruntime/gxsound.h @@ -1,4 +1,3 @@ - #ifndef GXSOUND_H #define GXSOUND_H @@ -35,4 +34,4 @@ class gxSound { void setPan(float pan); }; -#endif +#endif \ No newline at end of file diff --git a/gxruntime/gxtimer.cpp b/gxruntime/gxtimer.cpp index 84bde224..3ba666ef 100644 --- a/gxruntime/gxtimer.cpp +++ b/gxruntime/gxtimer.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "gxtimer.h" #include "gxruntime.h" @@ -27,5 +26,4 @@ int gxTimer::wait() { int n = ticks_put - ticks_get; ticks_get += n; return n; -} - +} \ No newline at end of file diff --git a/gxruntime/gxtimer.h b/gxruntime/gxtimer.h index dfe384e2..aa8e9ab8 100644 --- a/gxruntime/gxtimer.h +++ b/gxruntime/gxtimer.h @@ -1,4 +1,3 @@ - #ifndef GXTIMER_H #define GXTIMER_H diff --git a/gxruntime/gxutf8.h b/gxruntime/gxutf8.h index e075214f..631f0900 100644 --- a/gxruntime/gxutf8.h +++ b/gxruntime/gxutf8.h @@ -24,4 +24,4 @@ class UTF8 { static std::string UTF8::GetSystemFontFile(const std::string& faceName); }; -#endif +#endif \ No newline at end of file diff --git a/gxruntime/std.cpp b/gxruntime/std.cpp index 7bc955da..66e8e905 100644 --- a/gxruntime/std.cpp +++ b/gxruntime/std.cpp @@ -1,2 +1 @@ - -#include "std.h" +#include "std.h" \ No newline at end of file diff --git a/gxruntime/std.h b/gxruntime/std.h index 804e28a2..7e5f5cc3 100644 --- a/gxruntime/std.h +++ b/gxruntime/std.h @@ -1,4 +1,3 @@ - #ifndef STD_H #define STD_H diff --git a/linker/image_util.cpp b/linker/image_util.cpp index 3358d8de..d66bf05d 100644 --- a/linker/image_util.cpp +++ b/linker/image_util.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "image_util.h" diff --git a/linker/image_util.h b/linker/image_util.h index 57795dbb..16e9e0f2 100644 --- a/linker/image_util.h +++ b/linker/image_util.h @@ -1,4 +1,3 @@ - #ifndef IMAGE_UTIL_H #define IMAGE_UTIL_H diff --git a/linker/linker.cpp b/linker/linker.cpp index efaae63b..2f18c0de 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -1,4 +1,3 @@ - #include "std.h" #include "linker.h" #include "image_util.h" diff --git a/linker/linker.h b/linker/linker.h index 49937855..b45619ae 100644 --- a/linker/linker.h +++ b/linker/linker.h @@ -1,4 +1,3 @@ - #ifndef LINKER_H #define LINKER_H diff --git a/linker/std.cpp b/linker/std.cpp index 7bc955da..66e8e905 100644 --- a/linker/std.cpp +++ b/linker/std.cpp @@ -1,2 +1 @@ - -#include "std.h" +#include "std.h" \ No newline at end of file diff --git a/linker/std.h b/linker/std.h index 3f1f7ef4..25b5c30e 100644 --- a/linker/std.h +++ b/linker/std.h @@ -1,4 +1,3 @@ - #ifndef STD_LINKER_H #define STD_LINKER_H diff --git a/linker_dll/linker_dll.cpp b/linker_dll/linker_dll.cpp index 30898711..c6deaaf1 100644 --- a/linker_dll/linker_dll.cpp +++ b/linker_dll/linker_dll.cpp @@ -1,4 +1,3 @@ - #include "../linker/std.h" #include "../linker/linker.h" diff --git a/stdutil/stdutil.h b/stdutil/stdutil.h index d53ef2c2..410d229a 100644 --- a/stdutil/stdutil.h +++ b/stdutil/stdutil.h @@ -1,4 +1,3 @@ - #ifndef STDUTIL_H #define STDUTIL_H @@ -19,7 +18,7 @@ void _cdecl operator delete(void* q); void _cdecl operator delete[](void* q); void _cdecl operator delete(void* q, const char* file, int line); void _cdecl operator delete[](void* q, const char* file, int line); -#define new new( __FILE__,__LINE__ ) +#define d_new new( __FILE__,__LINE__ ) #endif