From aafdc57ce9433ecc8753aec8d38074a48f1c30bd Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Wed, 8 Nov 2006 05:42:41 +0000
Subject: [PATCH] no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@543 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 packages/maps/ac_depot.cfg | 2 +-
 source/src/rendercubes.cpp | 7 ++++---
 source/src/rendermd2.cpp   | 5 +----
 source/src/rendermd3.cpp   | 1 -
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/maps/ac_depot.cfg b/packages/maps/ac_depot.cfg
index a8fe55e5..2e97e2f5 100644
--- a/packages/maps/ac_depot.cfg
+++ b/packages/maps/ac_depot.cfg
@@ -7,7 +7,7 @@ fogcolour 0
 mapmodelreset // start @ zero
 
 mapmodel 0 0 0 0 "nothing"
-mapmodel 2 16 0 0 "nothing_depot"
+mapmodel 2 16 0 0 "nothing"
 mapmodel 0 0 0 0 "nothing"
 mapmodel 3  1 0 0 "comp_bridge"    //3
 mapmodel 0 10 0 0 "ladder_10x"     //4
diff --git a/source/src/rendercubes.cpp b/source/src/rendercubes.cpp
index e83aca42..5f84c8d8 100644
--- a/source/src/rendercubes.cpp
+++ b/source/src/rendercubes.cpp
@@ -6,9 +6,10 @@ vector<vertex> verts;
 
 void setarraypointers()
 {
-    glVertexPointer(3, GL_FLOAT, sizeof(vertex), &verts[0].x);
-    glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(vertex), &verts[0].r);
-    glTexCoordPointer(2, GL_FLOAT, sizeof(vertex), &verts[0].u);
+	vertex *buf = verts.getbuf();
+    glVertexPointer(3, GL_FLOAT, sizeof(vertex), &buf->x);
+    glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(vertex), &buf->r);
+    glTexCoordPointer(2, GL_FLOAT, sizeof(vertex), &buf->u);
 };
 
 // generating the actual vertices is done dynamically every frame and sits at the
diff --git a/source/src/rendermd2.cpp b/source/src/rendermd2.cpp
index e10de6c5..17f725cf 100644
--- a/source/src/rendermd2.cpp
+++ b/source/src/rendermd2.cpp
@@ -291,10 +291,7 @@ md2 *loadmodel(char *name)
 
 void mapmodel(char *rad, char *h, char *zoff, char *snap, char *name)
 {
-    char *mpdir = "mapmodels/";
-    char *lname = new char[ strlen(mpdir) + strlen(name) + 1 ];
-    strcpy(lname, mpdir);
-    strcat(lname, name);
+	s_sprintfd(lname)("mapmodels/%s", name);
     md2 *m = loadmodel(lname);
     mapmodelinfo mmi = { atoi(rad), atoi(h), atoi(zoff), atoi(snap), m->loadname };
     m->mmi = mmi;
diff --git a/source/src/rendermd3.cpp b/source/src/rendermd3.cpp
index 1c9fd0c2..8ea7a3e5 100644
--- a/source/src/rendermd3.cpp
+++ b/source/src/rendermd3.cpp
@@ -3,7 +3,6 @@
 
 #include "cube.h"
 
-const int FIRSTMD3 = 20;
 enum { MDL_LOWER = 0, MDL_UPPER, MDL_HEAD };
 
 enum { MDL_GUN_IDLE = 0, MDL_GUN_ATTACK, MDL_GUN_RELOAD, MDL_GUN_ATTACK2}; // attack2 is for grenade only