src/loaders.inc

@@ -25,9 +25,6 @@ static int mdlloader(void *ud, struct ResManRes *res) {
 	} header;
 	fread(&header, 4, 4, f);
 	
-	// ' ' or '1'
-	char version = ((char*) &header.magic)[3];
-	
 	int colorsEnabled = header.flags & 1;
 	
 	mat4 *invBind = _mm_malloc(sizeof(*invBind) * header.boneCount, 16);
@@ -86,11 +83,8 @@ static int mdlloader(void *ud, struct ResManRes *res) {
 	fread(&meshes, sizeof(uint16_t), 1, f);
 	
 	for(uint32_t i = 0; i < meshes; i++) {
-		uint32_t start = 0;
-		uint32_t number = 0;
-		
-		fread(&start, version == ' ' ? sizeof(uint16_t) : sizeof(uint32_t), 1, f);
-		fread(&number, version == ' ' ? sizeof(uint16_t) : sizeof(uint32_t), 1, f);
+		uint16_t startnum[2];
+		fread(startnum, sizeof(uint16_t), 2, f);
 		
 		char buf[256] = {};
 		for(int c = 0; c < sizeof(buf) - 1; c++) {
@@ -100,7 +94,7 @@ static int mdlloader(void *ud, struct ResManRes *res) {
 			}
 		}
 		
-		k3MdlAddMesh(mdl, resman_ref(RESMAN_MATERIAL, buf), start, number);
+		k3MdlAddMesh(mdl, resman_ref(RESMAN_MATERIAL, buf), startnum[0], startnum[1]);
 	}
 	
 	for(size_t i = 0; i < header.animCount; i++) {
@@ -184,7 +178,7 @@ static int streamloader(void *ud, struct ResManRes *res) {
 	snprintf(namebuf, sizeof(namebuf), "assets/aud/%s", res->name);
 	
 	res->thing = k3MixSourceFile(namebuf);
-	return !!res->thing;
+	return 1;
 }
 
 static int refresh_texture(struct ResManRes *res) {

src/luaapi.c

@@ -385,9 +385,7 @@ static int game_addentity(lua_State *L) {
 }
 
 double LuaapiStartTime;
-float LuaapiFov = 75.0f;
-float LuaapiNear = 0.01f;
-float LuaapiFar = 80.0f;
+float LuaapiFov = 75;
 
 static int gametriggersref;
 static int luaapi_triggerfunc(size_t id, uint16_t ethis, uint16_t ethat, uint8_t event) {
@@ -1278,10 +1276,6 @@ static int game_get(lua_State *L) {
 		}
 	} else if(!strcmp(i, "fov")) {
 		lua_pushnumber(L, LuaapiFov);
-	} else if(!strcmp(i, "near")) {
-		lua_pushnumber(L, LuaapiNear);
-	} else if(!strcmp(i, "far")) {
-		lua_pushnumber(L, LuaapiFar);
 	} else if(!strcmp(i, "rate")) {
 		lua_pushinteger(L, GAME_TPS);
 	} else if(!strcmp(i, "camera")) {
@@ -1311,10 +1305,6 @@ static int game_set(lua_State *L) {
 		Game.spectated = lua_isnil(L, 3) ? ENT_ID_INVALID : lua_tointeger(L, 3);
 	} else if(!strcmp(i, "fov")) {
 		LuaapiFov = lua_tonumber(L, 3);
-	} else if(!strcmp(i, "near")) {
-		LuaapiNear = lua_tonumber(L, 3);
-	} else if(!strcmp(i, "far")) {
-		LuaapiFar = lua_tonumber(L, 3);
 	} else if(!strcmp(i, "menu")) {
 		struct menuitem *item = lua_touserdata(L, 3);
 		UiActive = item ? item->ptr : NULL;

src/luaapi.h

@@ -14,8 +14,6 @@ extern int LuaapiFirstPerson;
 
 extern double LuaapiStartTime;
 extern float LuaapiFov;
-extern float LuaapiNear;
-extern float LuaapiFar;
 
 extern struct k3Tex *LuaapiSkybox;
 extern vec4 LuaapiSkyboxRotation;

src/main.c

@@ -505,7 +505,7 @@ int main(int argc_, char **argv_) {
 		glfwGetFramebufferSize(GameWnd, &width, &height);
 		
 		mat4 proj;
-		glm_perspective(glm_rad(LuaapiFov), (float) width / height, LuaapiNear, LuaapiFar, proj);
+		glm_perspective(glm_rad(LuaapiFov), (float) width / height, 0.1f, 80.f, proj);
 		
 		/* Third-person camera movement */
 		struct LocalRay camray = {};