Subversion Repositories eduke32

Compare Revisions

Ignore whitespace Rev 8473 → Rev 8474

/source/kenbuild/src/bstub.cpp
143,14 → 143,12
 
Ken_PostStartupWindow();
 
tiletovox[PLAYER] = nextvoxid++;
tiletovox[BROWNMONSTER] = nextvoxid++;
 
return 0;
}
 
void ExtPostInit(void)
{
Ken_LoadVoxels();
palettePostLoadLookups();
}
 
282,14 → 280,6
switch (tspr->picnum)
{
case PLAYER:
if (!voxoff[tiletovox[PLAYER]][0])
{
if (qloadkvx(tiletovox[PLAYER],"voxel000.kvx"))
{
tiletovox[PLAYER] = -1;
break;
}
}
//tspr->cstat |= 48; tspr->picnum = tiletovox[tspr->picnum];
longptr = (int *)voxoff[tiletovox[PLAYER]][0];
tspr->xrepeat = scale(tspr->xrepeat,56,longptr[2]);
297,14 → 287,6
tspr->shade -= 6;
break;
case BROWNMONSTER:
if (!voxoff[tiletovox[BROWNMONSTER]][0])
{
if (qloadkvx(tiletovox[BROWNMONSTER],"voxel001.kvx"))
{
tiletovox[BROWNMONSTER] = -1;
break;
}
}
//tspr->cstat |= 48; tspr->picnum = tiletovox[tspr->picnum];
break;
}
/source/kenbuild/src/common.cpp
78,3 → 78,11
for (i=0; i<256; i++) tempbuf[i] = i; //(i&31)+32;
paletteMakeLookupTable(18,tempbuf,32,32,192,1);
}
 
void Ken_LoadVoxels()
{
if (!qloadkvx(nextvoxid,"voxel000.kvx"))
tiletovox[PLAYER] = nextvoxid++;
if (!qloadkvx(nextvoxid,"voxel001.kvx"))
tiletovox[BROWNMONSTER] = nextvoxid++;
}
/source/kenbuild/src/common_game.h
5,3 → 5,5
extern const char *G_GrpFile(void);
 
void Ken_PostStartupWindow(void);
 
void Ken_LoadVoxels(void);
/source/kenbuild/src/game.cpp
553,10 → 553,7
option[4] = (numplayers >= 2);
 
artLoadFiles("tiles000.art",1048576); //Load artwork
if (!qloadkvx(nextvoxid,"voxel000.kvx"))
tiletovox[PLAYER] = nextvoxid++;
if (!qloadkvx(nextvoxid,"voxel001.kvx"))
tiletovox[BROWNMONSTER] = nextvoxid++;
Ken_LoadVoxels();
if (!loaddefinitionsfile(G_DefFile())) buildputs("Definitions file loaded.\n");
 
if (enginePostInit())