projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more sensible world loading stuff (wip)
[carveJwlIkooP6JGAAIwe30JlM.git]
/
model.h
diff --git
a/model.h
b/model.h
index fc71a4f1413c4a6e0938e7408c94eae54da31ea5..f9ec815dfc78a42f63b0b1e4cdb323c81be96920 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-7,7
+7,8
@@
#include "skaterift.h"
#include "skaterift.h"
-#define MDL_VERSION_NR 101
+#define MDL_VERSION_MIN 101
+#define MDL_VERSION_NR 102
enum mdl_shader
{
enum mdl_shader
{
@@
-17,7
+18,8
@@
enum mdl_shader
k_shader_standard_vertex_blend = 3,
k_shader_water = 4,
k_shader_invisible = 5,
k_shader_standard_vertex_blend = 3,
k_shader_water = 4,
k_shader_invisible = 5,
- k_shader_boundary = 6
+ k_shader_boundary = 6,
+ k_shader_fxglow = 7
};
enum mdl_surface_prop
};
enum mdl_surface_prop
@@
-413,10
+415,10
@@
VG_STATIC void mdl_open( mdl_context *mdl, const char *path, void *lin_alloc )
if( l != 1 )
mdl_load_fatal_corrupt( mdl );
if( l != 1 )
mdl_load_fatal_corrupt( mdl );
- if( mdl->info.version < MDL_VERSION_
NR
){
+ if( mdl->info.version < MDL_VERSION_
MIN
){
vg_warn( "For model: %s\n", path );
vg_warn( "For model: %s\n", path );
- vg_warn( " version: %u (
current: %u)\n", mdl->info.version
,
- MDL_VERSION_NR );
+ vg_warn( " version: %u (
min: %u, current: %u)\n"
,
+
mdl->info.version, MDL_VERSION_MIN,
MDL_VERSION_NR );
vg_fatal_error( "Legacy model version incompatable" );
}
vg_fatal_error( "Legacy model version incompatable" );
}