From 795d161563819b1233f971d6d98e39f11a970615 Mon Sep 17 00:00:00 2001 From: maride Date: Sat, 2 Apr 2016 18:23:08 +0200 Subject: [PATCH] That's a C++ project, maride. Stupid maride. --- game.xcodeproj/project.pbxproj | 8 ++++---- mVertex.c => mVertex.cpp | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) rename mVertex.c => mVertex.cpp (67%) diff --git a/game.xcodeproj/project.pbxproj b/game.xcodeproj/project.pbxproj index 20b7b59..bf1c272 100644 --- a/game.xcodeproj/project.pbxproj +++ b/game.xcodeproj/project.pbxproj @@ -20,7 +20,7 @@ 7489D6131CB000520063AC48 /* HID_Utilities.c in Sources */ = {isa = PBXBuildFile; fileRef = 7489D60D1CB000520063AC48 /* HID_Utilities.c */; settings = {ASSET_TAGS = (); }; }; 7489D61C1CB000F00063AC48 /* ImmrHIDUtilAddOn.c in Sources */ = {isa = PBXBuildFile; fileRef = 7489D61A1CB000F00063AC48 /* ImmrHIDUtilAddOn.c */; settings = {ASSET_TAGS = (); }; }; 7489D6211CB005370063AC48 /* LZRW3-A.C in Sources */ = {isa = PBXBuildFile; fileRef = 7489D61F1CB005370063AC48 /* LZRW3-A.C */; settings = {ASSET_TAGS = (); }; }; - 7489D6271CB016C30063AC48 /* mVertex.c in Sources */ = {isa = PBXBuildFile; fileRef = 7489D6261CB016C30063AC48 /* mVertex.c */; settings = {ASSET_TAGS = (); }; }; + 7489D6271CB016C30063AC48 /* mVertex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7489D6261CB016C30063AC48 /* mVertex.cpp */; settings = {ASSET_TAGS = (); }; }; 7F06105A0876ED46001EA95C /* ai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F060FE50876ED46001EA95C /* ai.cpp */; }; 7F06105D0876ED46001EA95C /* carphysics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F060FEA0876ED46001EA95C /* carphysics.cpp */; }; 7F06105E0876ED46001EA95C /* carselection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F060FEC0876ED46001EA95C /* carselection.cpp */; }; @@ -128,7 +128,7 @@ 7489D61F1CB005370063AC48 /* LZRW3-A.C */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "LZRW3-A.C"; sourceTree = ""; }; 7489D6201CB005370063AC48 /* port.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = port.h; sourceTree = ""; }; 7489D6241CB0152C0063AC48 /* mVertex.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mVertex.h; sourceTree = ""; }; - 7489D6261CB016C30063AC48 /* mVertex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mVertex.c; sourceTree = ""; }; + 7489D6261CB016C30063AC48 /* mVertex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mVertex.cpp; sourceTree = ""; }; 7F060FE50876ED46001EA95C /* ai.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ai.cpp; sourceTree = ""; }; 7F060FEA0876ED46001EA95C /* carphysics.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = carphysics.cpp; sourceTree = ""; }; 7F060FEB0876ED46001EA95C /* carphysics.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = carphysics.h; sourceTree = ""; }; @@ -374,7 +374,7 @@ isa = PBXGroup; children = ( 7489D6241CB0152C0063AC48 /* mVertex.h */, - 7489D6261CB016C30063AC48 /* mVertex.c */, + 7489D6261CB016C30063AC48 /* mVertex.cpp */, ); name = maride; sourceTree = ""; @@ -629,7 +629,7 @@ 7F06105E0876ED46001EA95C /* carselection.cpp in Sources */, 7F0610640876ED46001EA95C /* collision.cpp in Sources */, 7F0610650876ED46001EA95C /* config.cpp in Sources */, - 7489D6271CB016C30063AC48 /* mVertex.c in Sources */, + 7489D6271CB016C30063AC48 /* mVertex.cpp in Sources */, 7F0610660876ED46001EA95C /* controls.cpp in Sources */, 7F0610670876ED46001EA95C /* entities.cpp in Sources */, 7F0610680876ED46001EA95C /* environment.cpp in Sources */, diff --git a/mVertex.c b/mVertex.cpp similarity index 67% rename from mVertex.c rename to mVertex.cpp index a81fe2a..a3daa5b 100644 --- a/mVertex.c +++ b/mVertex.cpp @@ -8,7 +8,6 @@ #include "mVertex.h" -void mVertex3fv(tVector3 vertex) { - tVector3 v = *vertex; +void mVertex3fv(tVector3 v) { glVertex3f(v.x, v.y, v.z); } \ No newline at end of file