no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@543 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2006-11-08 05:42:41 +00:00
parent fd32578876
commit aafdc57ce9
4 changed files with 6 additions and 9 deletions
+1 -1
View File
@@ -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
+4 -3
View File
@@ -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
+1 -4
View File
@@ -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;
-1
View File
@@ -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