Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-11-24 19:14:40 +0000
committerStijn Buys <ingar@osirion.org>2013-11-24 19:14:40 +0000
commitf70d38dd4e477b25fc134a0b521fff3330c7d08d (patch)
treecaa8598a8e08c0c4e62e7c360749287007f889c3
parentae0e4d09769cde714dfffff1aadca061a82d4b4b (diff)
More model filename cleanups.
-rw-r--r--base/ini/templates.ini4
-rw-r--r--base/ini/zones/carthagio.ini2
-rw-r--r--base/maps/cargo/cargopod.map (renamed from base/maps/static/cargopod.map)0
-rw-r--r--base/maps/weapons/mine_generic.map (renamed from base/maps/static/spacemine.map)2
-rw-r--r--base/models/weapons/mine_generic/mine_generic.ase (renamed from base/models/static/spacemine/spacemine.ase)0
5 files changed, 4 insertions, 4 deletions
diff --git a/base/ini/templates.ini b/base/ini/templates.ini
index 1d39ac4..d3238b9 100644
--- a/base/ini/templates.ini
+++ b/base/ini/templates.ini
@@ -44,12 +44,12 @@ radius=8
; the cargopod template is used by the game code
[template]
label=cargopod
-model=maps/static/cargopod
+model=maps/cargo/cargopod
radius=0.1
; the spacemine template is used by the game code
[template]
label=spacemine
; default mine model
-model=maps/static/spacemine
+model=maps/weapons/mine_generic
radius=0.1 \ No newline at end of file
diff --git a/base/ini/zones/carthagio.ini b/base/ini/zones/carthagio.ini
index df146f1..cb6d96c 100644
--- a/base/ini/zones/carthagio.ini
+++ b/base/ini/zones/carthagio.ini
@@ -34,7 +34,7 @@ angles=0 225 0
radius=64
dock=yes
; [r g b] entity color, values in the 0-1 range
-color=.8 .5 .5
+color=255 255 255
; [string] globe texture name
texture=
diff --git a/base/maps/static/cargopod.map b/base/maps/cargo/cargopod.map
index 27eb3ee..27eb3ee 100644
--- a/base/maps/static/cargopod.map
+++ b/base/maps/cargo/cargopod.map
diff --git a/base/maps/static/spacemine.map b/base/maps/weapons/mine_generic.map
index 0d001d1..bfec1b0 100644
--- a/base/maps/static/spacemine.map
+++ b/base/maps/weapons/mine_generic.map
@@ -33,7 +33,7 @@
// entity 1
{
"classname" "misc_model"
-"model" "models/static/spacemine/spacemine.ase"
+"model" "models/weapons/mine_generic/mine_generic.ase"
"modelscale" "4"
}
// entity 2
diff --git a/base/models/static/spacemine/spacemine.ase b/base/models/weapons/mine_generic/mine_generic.ase
index 0946b3c..0946b3c 100644
--- a/base/models/static/spacemine/spacemine.ase
+++ b/base/models/weapons/mine_generic/mine_generic.ase