summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororoborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-07-14 17:56:15 +0000
committeroroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-07-14 17:56:15 +0000
commitcaf0d20fd8ddb972af244da026855c1d21842f9f (patch)
treee7a067e6a2a18c4760fa896b96234b1bc9faa525
parent790fbd52e4b738265a381a099019d2c9a86f9ee5 (diff)
- v scriptoch aren *.map sa do nazvu modulu nepridava jeho pripona, tu si program doplni sam podla OS
priklad : loadModule file="libmodWall" git-svn-id: http://opensvn.csie.org/tuxanci_ng@138 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
-rw-r--r--config.h2
-rw-r--r--data/arena/ba_in_a_captivity_of_8-bit.map4
-rw-r--r--data/arena/construction_site.map2
-rw-r--r--data/arena/for_a_good_night.map2
-rw-r--r--data/arena/in_a_captivity_of_8-bit.map4
-rw-r--r--data/arena/night_workshift.map4
-rwxr-xr-xsrc/base/modules.c6
-rw-r--r--src/base/modules.h3
8 files changed, 17 insertions, 10 deletions
diff --git a/config.h b/config.h
index 422c4ac..304808b 100644
--- a/config.h
+++ b/config.h
@@ -1 +1 @@
-#define TUXANCI_NG_VERSION "svn137"
+#define TUXANCI_NG_VERSION "svn138"
diff --git a/data/arena/ba_in_a_captivity_of_8-bit.map b/data/arena/ba_in_a_captivity_of_8-bit.map
index 345916e..4add3d9 100644
--- a/data/arena/ba_in_a_captivity_of_8-bit.map
+++ b/data/arena/ba_in_a_captivity_of_8-bit.map
@@ -3,8 +3,8 @@ name In a captivity of 8-bit
netName BAIACO8B
screen ba_in_a_captivity_of_8-bit.png
-loadModule file="libmodWall.so"
-loadModule file="libmodTeleport.so"
+loadModule file="libmodWall"
+loadModule file="libmodTeleport"
loadMusic file="in_a_captivity_of_8-bit.ogg" name="in_a_captivity_of_8-bit"
diff --git a/data/arena/construction_site.map b/data/arena/construction_site.map
index baed284..e4ac7a1 100644
--- a/data/arena/construction_site.map
+++ b/data/arena/construction_site.map
@@ -3,7 +3,7 @@ name construction site
netName CS
screen construction_site.png
-loadModule file="libmodWall.so"
+loadModule file="libmodWall"
loadMusic file="night_workshift.ogg" name="night_workshift"
diff --git a/data/arena/for_a_good_night.map b/data/arena/for_a_good_night.map
index da33cac..2b4e5fd 100644
--- a/data/arena/for_a_good_night.map
+++ b/data/arena/for_a_good_night.map
@@ -3,7 +3,7 @@ name For a good night
netName FAGN
screen for_a_good_night.png
-loadModule file="libmodWall.so"
+loadModule file="libmodWall"
loadMusic file="for_a_good_night.ogg" name="for_a_good_night"
diff --git a/data/arena/in_a_captivity_of_8-bit.map b/data/arena/in_a_captivity_of_8-bit.map
index ca0eca2..dbe9293 100644
--- a/data/arena/in_a_captivity_of_8-bit.map
+++ b/data/arena/in_a_captivity_of_8-bit.map
@@ -3,8 +3,8 @@ name In a captivity of 8-bit
netName IACO8B
screen in_a_captivity_of_8-bit.png
-loadModule file="libmodWall.so"
-loadModule file="libmodTeleport.so"
+loadModule file="libmodWall"
+loadModule file="libmodTeleport"
loadMusic file="in_a_captivity_of_8-bit.ogg" name="in_a_captivity_of_8-bit"
diff --git a/data/arena/night_workshift.map b/data/arena/night_workshift.map
index 24282bc..9e13fbd 100644
--- a/data/arena/night_workshift.map
+++ b/data/arena/night_workshift.map
@@ -3,8 +3,8 @@ name night workshift
netName NW
screen night_workshift.png
-loadModule file="libmodWall.so"
-loadModule file="libmodPipe.so"
+loadModule file="libmodWall"
+loadModule file="libmodPipe"
loadMusic file="night_workshift.ogg" name="night_workshift"
diff --git a/src/base/modules.c b/src/base/modules.c
index 7dd3148..b42df8b 100755
--- a/src/base/modules.c
+++ b/src/base/modules.c
@@ -184,7 +184,11 @@ int loadModule(char *name)
char str[STR_PATH_SIZE];
module_t *module;
- sprintf(str, PATH_MODULES "%s", name);
+#ifndef __WIN32__
+ sprintf(str, PATH_MODULES "%s" MODULE_TYPE_UNIX, name);
+#else
+ sprintf(str, PATH_MODULES "%s" MODULE_TYPE_WIN, name);
+#endif
accessExistFile(str);
module = newModule(str);
diff --git a/src/base/modules.h b/src/base/modules.h
index 5456ffb..1d68568 100644
--- a/src/base/modules.h
+++ b/src/base/modules.h
@@ -13,6 +13,9 @@
#include "image.h"
#endif
+#define MODULE_TYPE_UNIX ".so"
+#define MODULE_TYPE_WIN ".dll"
+
typedef struct export_fce_s
{
int (*fce_getValue)(char *line, char *env, char *val, int len);