*Quick fix for undefined terrain types.

*Local configuration.
Swyter · Jul 30, 2012 · 7dc6de3 · 7dc6de3
1 parent b93b3d1
commit 7dc6de3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/_configureme.ini b/_configureme.ini
@@ -5,8 +5,8 @@ cartographer.conf={
   fontpath =  reg['wb'],                  --> you can use the following macros: reg['mab'], reg['wb'], reg['wfas']
   mparties = "res\\module_parties.py",    --> paths are enclosed in quotes, use \\ as separator, don't even think about these: \ this is not Thorgrim's
 
-    maptxt =  reg['wb'].."\\modules\\native",              --> use .. to concatenate strings, relative paths also work
- maptxtout =  reg['wb'].."\\modules\\native\\map_out.txt", --  the module_parties under "\\res" is included as example, don't use it
+    maptxt =  "res",              --> use .. to concatenate strings, relative paths also work
+ maptxtout =  "res\\map_out.txt", --  the module_parties under "\\res" is included as example, don't use it
 
     mapobj = "mymap.obj",
  mapobjout = "mymap.obj"

diff --git a/cartographer.lua b/cartographer.lua
@@ -218,7 +218,7 @@ lujgl.setRenderCallback(function()
           gl.glNormal3d(nm.x,nm.y,nm.z)
 
           x=tonumber(mab.map.fcs[i][11])
-          gl.glColor3f(unpack(mab.map.terrain[x]))
+          gl.glColor3f(unpack(mab.map.terrain[x] or {1,0,1}))
 
           for j=1,3 do
             local vt=mab.map.vtx[mab.map.fcs[i][j]]