View | Details | Raw Unified | Return to bug 190619 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +4 lines)
Lines 2-12 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	tome4
4
PORTNAME=	tome4
5
PORTVERSION=	1.1.5
5
PORTVERSION=	1.2.2
6
PORTREVISION=	1
7
CATEGORIES=	games
6
CATEGORIES=	games
8
MASTER_SITES=	http://te4.org/dl/t-engine/ \
7
MASTER_SITES=	http://te4.org/dl/t-engine/ \
9
		SF/lifanov-ports-icons/${PORTNAME}/:icons
8
		SF/lifanov-ports-distfiles/${PORTNAME}/:icons
10
DISTFILES=	t-engine4-src-${PORTVERSION}${EXTRACT_SUFX} \
9
DISTFILES=	t-engine4-src-${PORTVERSION}${EXTRACT_SUFX} \
11
		${PORTNAME}.png:icons
10
		${PORTNAME}.png:icons
12
EXTRACT_ONLY=	t-engine4-src-${PORTVERSION}${EXTRACT_SUFX}
11
EXTRACT_ONLY=	t-engine4-src-${PORTVERSION}${EXTRACT_SUFX}
Lines 27-36 Link Here
27
USES=		gmake openal:al tar:bzip2
26
USES=		gmake openal:al tar:bzip2
28
USE_SDL=	image2 sdl2 ttf2
27
USE_SDL=	image2 sdl2 ttf2
29
USE_GL=		gl
28
USE_GL=		gl
29
USE_CSTD=	gnu89
30
SUB_FILES=	tome4
30
SUB_FILES=	tome4
31
MAKE_JOBS_UNSAFE=yes
31
MAKE_JOBS_UNSAFE=yes
32
32
33
pre-build:
33
pre-build:
34
	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/premake4.lua
34
	(cd ${WRKSRC} && premake4 gmake)
35
	(cd ${WRKSRC} && premake4 gmake)
35
	@${REINPLACE_CMD} 's|-lpthread|-pthread|' ${WRKSRC}/build/TEngine.make
36
	@${REINPLACE_CMD} 's|-lpthread|-pthread|' ${WRKSRC}/build/TEngine.make
36
37
(-)distinfo (-2 / +2 lines)
Lines 1-4 Link Here
1
SHA256 (t-engine4-src-1.1.5.tar.bz2) = f911b095064153b97b62fcb72124cdbcf19d712c24e5a735c7de6b98e527d4dd
1
SHA256 (t-engine4-src-1.2.2.tar.bz2) = 6d5706636efac1418828c4cc56b61b277848ccc2bdee0edf67ce9dbfd23c7995
2
SIZE (t-engine4-src-1.1.5.tar.bz2) = 259331390
2
SIZE (t-engine4-src-1.2.2.tar.bz2) = 278797999
3
SHA256 (tome4.png) = b5223208ca6f0a51f8bbe3b96055f38f94336dbeca6704db6684fec00fad1a36
3
SHA256 (tome4.png) = b5223208ca6f0a51f8bbe3b96055f38f94336dbeca6704db6684fec00fad1a36
4
SIZE (tome4.png) = 37143
4
SIZE (tome4.png) = 37143
(-)files/patch-build__te4core.lua (-15 / +23 lines)
Lines 1-20 Link Here
1
--- ./build/te4core.lua.orig	2014-01-05 19:42:37.000000000 -0500
1
--- ./build/te4core.lua.orig	2014-05-19 04:42:12.000000000 -0400
2
+++ ./build/te4core.lua	2014-01-05 19:42:37.000000000 -0500
2
+++ ./build/te4core.lua	2014-06-04 12:45:57.973283399 -0400
3
@@ -159,7 +159,7 @@
3
@@ -40,7 +40,6 @@
4
 	links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip" }
5
 	defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" }
6
 	defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION }
7
-	buildoptions { "-O3" }
4
 
8
 
5
 		files { "../src/luajit2/src/host/minilua.c" }
9
 	if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end
10
 	if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end
11
@@ -194,7 +193,7 @@
12
 		if _OPTIONS.wincross then
13
 			arch_test = os.capture("i686-pc-mingw32-gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
14
 		else
15
-			arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
16
+			arch_test = os.capture("cc -E ../src/luajit2/src/lj_arch.h -dM", true)
17
 		end
6
 
18
 
7
-		local arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
8
+		local arch_test = os.capture("cc -E ../src/luajit2/src/lj_arch.h -dM", true)
9
 
10
 		if string.find(arch_test, "LJ_TARGET_X64") then
19
 		if string.find(arch_test, "LJ_TARGET_X64") then
11
 			target_arch = "x64"
20
@@ -253,7 +252,7 @@
12
@@ -201,7 +201,7 @@
21
 		if _OPTIONS.wincross then
13
 		links { "minilua" }
22
 			arch_test = os.capture("i686-pc-mingw32-gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
23
 		else
24
-			arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
25
+			arch_test = os.capture("cc -E ../src/luajit2/src/lj_arch.h -dM", true)
26
 		end
14
 
27
 
15
 		local dasm_flags = ""
16
-		local arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
17
+		local arch_test = os.capture("cc -E ../src/luajit2/src/lj_arch.h -dM", true)
18
 
19
 		if string.find(arch_test, "LJ_TARGET_X64") then
28
 		if string.find(arch_test, "LJ_TARGET_X64") then
20
 			target_arch = "x64"
(-)files/patch-premake4.lua (-5 / +17 lines)
Lines 1-6 Link Here
1
--- ./premake4.lua.orig	2014-01-06 20:04:42.000000000 -0500
1
--- ./premake4.lua.orig	2014-05-19 04:42:14.000000000 -0400
2
+++ ./premake4.lua	2014-03-23 19:34:38.037102075 -0400
2
+++ ./premake4.lua	2014-06-04 12:40:26.968305458 -0400
3
@@ -30,11 +30,14 @@
3
@@ -28,11 +28,6 @@
4
 			"/usr/i686-pc-mingw32/usr/include/",
5
 			"/usr/i686-pc-mingw32/usr/include/GL/",
6
 		}
7
-	else
8
-		includedirs {
9
-			"/opt/SDL-2.0/include/SDL2",
10
-			"/usr/include/GL",
11
-		}
12
 	end
13
 	if _OPTIONS.lua == "default" then includedirs{"src/lua"}
14
 	elseif _OPTIONS.lua == "jit2" then includedirs{"src/luajit2/src", "src/luajit2/dynasm",}
15
@@ -44,11 +39,14 @@
4
 
16
 
5
 configuration "bsd"
17
 configuration "bsd"
6
 	libdirs {
18
 	libdirs {
Lines 14-22 Link Here
14
+		"-pthread",
26
+		"-pthread",
15
+	}
27
+	}
16
 
28
 
29
 if _OPTIONS.wincross then
17
 configuration "windows"
30
 configuration "windows"
18
 	libdirs {
31
@@ -86,8 +84,6 @@
19
@@ -61,8 +64,6 @@
20
 
32
 
21
 configuration "Release"
33
 configuration "Release"
22
 	defines { "NDEBUG=1" }
34
 	defines { "NDEBUG=1" }
(-)files/patch-src__bspatch.c (+177 lines)
Line 0 Link Here
1
--- ./src/bspatch.c.orig	2014-05-19 04:42:14.000000000 -0400
2
+++ ./src/bspatch.c	2014-06-04 12:40:26.918305830 -0400
3
@@ -24,13 +24,13 @@
4
  * POSSIBILITY OF SUCH DAMAGE.
5
  */
6
 
7
-#include "bzlib.h"
8
+#include <bzlib.h>
9
 #include <stdlib.h>
10
 #include <stdio.h>
11
 #include <string.h>
12
+#include <err.h>
13
 #include <unistd.h>
14
 #include <fcntl.h>
15
-#include <sys/types.h>
16
 
17
 static off_t offtin(u_char *buf)
18
 {
19
@@ -50,13 +50,7 @@
20
 	return y;
21
 }
22
 
23
-#ifndef fseeko
24
-#define fseeko fseek
25
-#endif
26
-
27
-#define returnerr(ret, str, f1, f2) { printf(str, f1, f2); perror("\nError in bspatch\n"); return (ret); }
28
-
29
-int bspatch(char *infile, char *outfile, char *patchfile)
30
+int bspatch(int argc,char * argv[])
31
 {
32
 	FILE * f, * cpf, * dpf, * epf;
33
 	BZFILE * cpfbz2, * dpfbz2, * epfbz2;
34
@@ -71,9 +65,11 @@
35
 	off_t lenread;
36
 	off_t i;
37
 
38
+	if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]);
39
+
40
 	/* Open patch file */
41
-	if ((f = fopen(patchfile, "r")) == NULL)
42
-		returnerr(1, "fopen(%s)", patchfile, 0);
43
+	if ((f = fopen(argv[3], "r")) == NULL)
44
+		err(1, "fopen(%s)", argv[3]);
45
 
46
 	/*
47
 	File format:
48
@@ -91,53 +87,54 @@
49
 
50
 	/* Read header */
51
 	if (fread(header, 1, 32, f) < 32) {
52
-		if (feof(f)) returnerr(1, "Corrupt patch", 0, 0);
53
-		returnerr(1, "fread(%s)", patchfile, 0);
54
+		if (feof(f))
55
+			errx(1, "Corrupt patch\n");
56
+		err(1, "fread(%s)", argv[3]);
57
 	}
58
 
59
 	/* Check for appropriate magic */
60
 	if (memcmp(header, "BSDIFF40", 8) != 0)
61
-		returnerr(1, "Corrupt patch", 0, 0);
62
+		errx(1, "Corrupt patch\n");
63
 
64
 	/* Read lengths from header */
65
 	bzctrllen=offtin(header+8);
66
 	bzdatalen=offtin(header+16);
67
 	newsize=offtin(header+24);
68
 	if((bzctrllen<0) || (bzdatalen<0) || (newsize<0))
69
-		returnerr(1, "Corrupt patch", 0, 0);
70
+		errx(1,"Corrupt patch\n");
71
 
72
 	/* Close patch file and re-open it via libbzip2 at the right places */
73
 	if (fclose(f))
74
-		returnerr(1, "fclose(%s)", patchfile, 0);
75
-	if ((cpf = fopen(patchfile, "r")) == NULL)
76
-		returnerr(1, "fopen(%s)", patchfile, 0);
77
+		err(1, "fclose(%s)", argv[3]);
78
+	if ((cpf = fopen(argv[3], "r")) == NULL)
79
+		err(1, "fopen(%s)", argv[3]);
80
 	if (fseeko(cpf, 32, SEEK_SET))
81
-		returnerr(1, "fseeko(%s, %lld)", patchfile,
82
+		err(1, "fseeko(%s, %lld)", argv[3],
83
 		    (long long)32);
84
 	if ((cpfbz2 = BZ2_bzReadOpen(&cbz2err, cpf, 0, 0, NULL, 0)) == NULL)
85
-		returnerr(1, "BZ2_bzReadOpen, bz2err = %d", cbz2err, 0);
86
-	if ((dpf = fopen(patchfile, "r")) == NULL)
87
-		returnerr(1, "fopen(%s)", patchfile, 0);
88
+		errx(1, "BZ2_bzReadOpen, bz2err = %d", cbz2err);
89
+	if ((dpf = fopen(argv[3], "r")) == NULL)
90
+		err(1, "fopen(%s)", argv[3]);
91
 	if (fseeko(dpf, 32 + bzctrllen, SEEK_SET))
92
-		returnerr(1, "fseeko(%s, %lld)", patchfile,
93
+		err(1, "fseeko(%s, %lld)", argv[3],
94
 		    (long long)(32 + bzctrllen));
95
 	if ((dpfbz2 = BZ2_bzReadOpen(&dbz2err, dpf, 0, 0, NULL, 0)) == NULL)
96
-		returnerr(1, "BZ2_bzReadOpen, bz2err = %d", dbz2err, 0);
97
-	if ((epf = fopen(patchfile, "r")) == NULL)
98
-		returnerr(1, "fopen(%s)", patchfile, 0);
99
+		errx(1, "BZ2_bzReadOpen, bz2err = %d", dbz2err);
100
+	if ((epf = fopen(argv[3], "r")) == NULL)
101
+		err(1, "fopen(%s)", argv[3]);
102
 	if (fseeko(epf, 32 + bzctrllen + bzdatalen, SEEK_SET))
103
-		returnerr(1, "fseeko(%s, %lld)", patchfile,
104
+		err(1, "fseeko(%s, %lld)", argv[3],
105
 		    (long long)(32 + bzctrllen + bzdatalen));
106
 	if ((epfbz2 = BZ2_bzReadOpen(&ebz2err, epf, 0, 0, NULL, 0)) == NULL)
107
-		returnerr(1, "BZ2_bzReadOpen, bz2err = %d", ebz2err, 0);
108
+		errx(1, "BZ2_bzReadOpen, bz2err = %d", ebz2err);
109
 
110
-	if(((fd=open(infile,O_RDONLY,0))<0) ||
111
+	if(((fd=open(argv[1],O_RDONLY,0))<0) ||
112
 		((oldsize=lseek(fd,0,SEEK_END))==-1) ||
113
 		((old=malloc(oldsize+1))==NULL) ||
114
 		(lseek(fd,0,SEEK_SET)!=0) ||
115
 		(read(fd,old,oldsize)!=oldsize) ||
116
-		(close(fd)==-1)) returnerr(1,"%s",infile, 0);
117
-	if((new=malloc(newsize+1))==NULL) returnerr(1,"not enough memory", 0, 0);
118
+		(close(fd)==-1)) err(1,"%s",argv[1]);
119
+	if((new=malloc(newsize+1))==NULL) err(1,NULL);
120
 
121
 	oldpos=0;newpos=0;
122
 	while(newpos<newsize) {
123
@@ -146,19 +143,19 @@
124
 			lenread = BZ2_bzRead(&cbz2err, cpfbz2, buf, 8);
125
 			if ((lenread < 8) || ((cbz2err != BZ_OK) &&
126
 			    (cbz2err != BZ_STREAM_END)))
127
-				returnerr(1, "Corrupt patch", 0, 0);
128
+				errx(1, "Corrupt patch\n");
129
 			ctrl[i]=offtin(buf);
130
 		};
131
 
132
 		/* Sanity-check */
133
 		if(newpos+ctrl[0]>newsize)
134
-			returnerr(1, "Corrupt patch", 0, 0);
135
+			errx(1,"Corrupt patch\n");
136
 
137
 		/* Read diff string */
138
 		lenread = BZ2_bzRead(&dbz2err, dpfbz2, new + newpos, ctrl[0]);
139
 		if ((lenread < ctrl[0]) ||
140
 		    ((dbz2err != BZ_OK) && (dbz2err != BZ_STREAM_END)))
141
-			returnerr(1, "Corrupt patch", 0, 0);
142
+			errx(1, "Corrupt patch\n");
143
 
144
 		/* Add old data to diff string */
145
 		for(i=0;i<ctrl[0];i++)
146
@@ -171,13 +168,13 @@
147
 
148
 		/* Sanity-check */
149
 		if(newpos+ctrl[1]>newsize)
150
-			returnerr(1, "Corrupt patch", 0, 0);
151
+			errx(1,"Corrupt patch\n");
152
 
153
 		/* Read extra string */
154
 		lenread = BZ2_bzRead(&ebz2err, epfbz2, new + newpos, ctrl[1]);
155
 		if ((lenread < ctrl[1]) ||
156
 		    ((ebz2err != BZ_OK) && (ebz2err != BZ_STREAM_END)))
157
-			returnerr(1, "Corrupt patch", 0, 0);
158
+			errx(1, "Corrupt patch\n");
159
 
160
 		/* Adjust pointers */
161
 		newpos+=ctrl[1];
162
@@ -189,12 +186,12 @@
163
 	BZ2_bzReadClose(&dbz2err, dpfbz2);
164
 	BZ2_bzReadClose(&ebz2err, epfbz2);
165
 	if (fclose(cpf) || fclose(dpf) || fclose(epf))
166
-		returnerr(1, "fclose(%s)", patchfile, 0);
167
+		err(1, "fclose(%s)", argv[3]);
168
 
169
 	/* Write the new file */
170
-	if(((fd=open(outfile,O_CREAT|O_TRUNC|O_WRONLY,0666))<0) ||
171
+	if(((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,0666))<0) ||
172
 		(write(fd,new,newsize)!=newsize) || (close(fd)==-1))
173
-		returnerr(1,"%s",outfile, 0);
174
+		err(1,"%s",argv[2]);
175
 
176
 	free(new);
177
 	free(old);
(-)files/patch-src__core_lua.c (+46 lines)
Line 0 Link Here
1
--- ./src/core_lua.c.orig	2014-05-19 04:42:14.000000000 -0400
2
+++ ./src/core_lua.c	2014-06-04 12:40:26.921306625 -0400
3
@@ -416,7 +416,7 @@
4
 
5
 static int lua_key_set_clipboard(lua_State *L)
6
 {
7
-	char *str = luaL_checkstring(L, 1);
8
+	const char *str = luaL_checkstring(L, 1);
9
 	SDL_SetClipboardText(str);
10
 	return 0;
11
 }
12
@@ -1458,7 +1458,7 @@
13
 		);
14
 	SDL_FillRect(s, NULL, SDL_MapRGBA(s->format, 255, 255, 255, 255));
15
 
16
-	glGenTextures(1, &gl_tex_white);
17
+	glGenTextures(1, (GLuint *)&gl_tex_white);
18
 	tfglBindTexture(GL_TEXTURE_2D, gl_tex_white);
19
 	int fw, fh;
20
 	make_texture_for_surface(s, &fw, &fh, false);
21
@@ -2870,7 +2870,7 @@
22
 static void png_write_data_fn(png_structp png_ptr, png_bytep data, png_size_t length)
23
 {
24
 	luaL_Buffer *B = (luaL_Buffer*)png_get_io_ptr(png_ptr);
25
-	luaL_addlstring(B, data, length);
26
+	luaL_addlstring(B, (const char *)data, length);
27
 }
28
 static void png_output_flush_fn(png_structp png_ptr)
29
 {
30
@@ -3561,14 +3561,14 @@
31
 	uLongf len;
32
 	const char *data = luaL_checklstring(L, 1, (size_t*)&len);
33
 	uLongf reslen = len * 1.1 + 12;
34
-#ifdef __APPLE__
35
+#if defined(__APPLE__) || defined(__FreeBSD__)
36
 	unsigned
37
 #endif
38
 	char *res = malloc(reslen);
39
 	z_stream zi;
40
 
41
 	zi.next_in = (
42
-#ifdef __APPLE__
43
+#if defined(__APPLE__) || defined(__FreeBSD__)
44
 	unsigned
45
 #endif
46
 	char *)data;
(-)files/patch-src__getself.c (-4 / +4 lines)
Lines 1-5 Link Here
1
--- ./src/getself.c.orig	2014-01-05 19:42:37.000000000 -0500
1
--- ./src/getself.c.orig	2014-05-19 04:42:14.000000000 -0400
2
+++ ./src/getself.c	2014-02-06 13:23:22.555164880 -0500
2
+++ ./src/getself.c	2014-06-04 12:40:26.923307598 -0400
3
@@ -42,6 +42,8 @@
3
@@ -42,6 +42,8 @@
4
 #elif defined(SELFEXE_BSD)
4
 #elif defined(SELFEXE_BSD)
5
 #include <limits.h>
5
 #include <limits.h>
Lines 9-20 Link Here
9
 const char *get_self_executable(int argc, char **argv)
9
 const char *get_self_executable(int argc, char **argv)
10
 {
10
 {
11
 	static char res[PATH_MAX];
11
 	static char res[PATH_MAX];
12
@@ -51,14 +53,13 @@
12
@@ -51,14 +53,12 @@
13
 	return res;
13
 	return res;
14
 }
14
 }
15
 
15
 
16
-#import <sys/sysctl.h>
16
-#import <sys/sysctl.h>
17
 
17
-
18
 int get_number_cpus()
18
 int get_number_cpus()
19
 {
19
 {
20
 	int count;
20
 	int count;
(-)files/patch-src__lpeg__lptypes.h (+11 lines)
Line 0 Link Here
1
--- ./src/lpeg/lptypes.h.orig	2014-05-19 04:42:14.000000000 -0400
2
+++ ./src/lpeg/lptypes.h	2014-06-04 12:40:26.924305800 -0400
3
@@ -9,7 +9,7 @@
4
 #define lptypes_h
5
 
6
 
7
-#if !defined(LPEG_DEBUG)
8
+#if !defined(LPEG_DEBUG) && !defined(NDEBUG)
9
 #define NDEBUG
10
 #endif
11
 
(-)files/patch-src__luaprofiler__core_profiler.c (+12 lines)
Line 0 Link Here
1
--- ./src/luaprofiler/core_profiler.c.orig	2014-05-19 04:42:14.000000000 -0400
2
+++ ./src/luaprofiler/core_profiler.c	2014-06-04 12:40:26.925305573 -0400
3
@@ -130,8 +130,7 @@
4
   out_filename = (_out_filename) ? (_out_filename):(OUT_FILENAME);
5
 
6
   /* the random string to build the logname is extracted */
7
-  /* from 'tmpnam()' (the '/tmp/' part is deleted)     */
8
-  randstr = tmpnam(NULL);
9
+  randstr = (char *)tmpfile();
10
   for (s = strtok(randstr, "/\\"); s; s = strtok(NULL, "/\\")) {
11
     randstr = s;
12
   }
(-)files/patch-src__web.c (+11 lines)
Line 0 Link Here
1
--- ./src/web.c.orig	2014-05-19 04:42:14.000000000 -0400
2
+++ ./src/web.c	2014-06-04 12:40:26.927305671 -0400
3
@@ -517,7 +517,7 @@
4
 	char *spawnname = NULL;
5
 	char *libname = NULL;
6
 	const char *self = get_self_executable(g_argc, g_argv);
7
-#if defined(SELFEXE_LINUX) || defined(SELFEXE_BSD)
8
+#if defined(SELFEXE_LINUX)
9
 #if defined(TE4_RELPATH64)
10
 	const char *spawnbname = "cef3spawn64";
11
 	spawnname = malloc(strlen(self) + strlen(spawnbname) + 1);
(-)files/pkg-message.in (+2 lines)
Line 0 Link Here
1
The game files for ToME can be found in %%DATADIR%%.
2
Launch the game with a wrapper in %%PREFIX%%/tome4
(-)pkg-plist (-43 / +122 lines)
Lines 4-13 Link Here
4
%%DATADIR%%/game/addons/tome-addon-dev.teaa
4
%%DATADIR%%/game/addons/tome-addon-dev.teaa
5
%%DATADIR%%/game/addons/tome-items-vault.teaa
5
%%DATADIR%%/game/addons/tome-items-vault.teaa
6
%%DATADIR%%/game/addons/tome-stone-wardens.teaa
6
%%DATADIR%%/game/addons/tome-stone-wardens.teaa
7
%%DATADIR%%/game/engines/te4-1.1.5.teae
7
%%DATADIR%%/game/engines/te4-1.2.1.teae
8
%%DATADIR%%/game/loader/init.lua
8
%%DATADIR%%/game/loader/init.lua
9
%%DATADIR%%/game/loader/pre-init.lua
9
%%DATADIR%%/game/loader/pre-init.lua
10
%%DATADIR%%/game/modules/boot-te4-1.1.5.team
10
%%DATADIR%%/game/modules/boot-te4-1.2.1.team
11
%%DATADIR%%/game/modules/example/class/Actor.lua
11
%%DATADIR%%/game/modules/example/class/Actor.lua
12
%%DATADIR%%/game/modules/example/class/Game.lua
12
%%DATADIR%%/game/modules/example/class/Game.lua
13
%%DATADIR%%/game/modules/example/class/Grid.lua
13
%%DATADIR%%/game/modules/example/class/Grid.lua
Lines 56-68 Link Here
56
%%DATADIR%%/game/modules/example_realtime/dialogs/Quit.lua
56
%%DATADIR%%/game/modules/example_realtime/dialogs/Quit.lua
57
%%DATADIR%%/game/modules/example_realtime/init.lua
57
%%DATADIR%%/game/modules/example_realtime/init.lua
58
%%DATADIR%%/game/modules/example_realtime/load.lua
58
%%DATADIR%%/game/modules/example_realtime/load.lua
59
%%DATADIR%%/game/modules/tome-1.1.5-gfx.team
59
%%DATADIR%%/game/modules/tome-1.2.1-gfx.team
60
%%DATADIR%%/game/modules/tome-1.1.5-music.team
60
%%DATADIR%%/game/modules/tome-1.2.1-music.team
61
%%DATADIR%%/game/modules/tome-1.1.5.team
61
%%DATADIR%%/game/modules/tome-1.2.1.team
62
%%DATADIR%%/game/profile-thread/Client.lua
62
%%DATADIR%%/game/profile-thread/Client.lua
63
%%DATADIR%%/game/profile-thread/UserChat.lua
63
%%DATADIR%%/game/profile-thread/UserChat.lua
64
%%DATADIR%%/game/profile-thread/init.lua
64
%%DATADIR%%/game/profile-thread/init.lua
65
%%DATADIR%%/game/thirdparty/Json2.lua
65
%%DATADIR%%/game/thirdparty/Json2.lua
66
%%DATADIR%%/game/thirdparty/cef3/cef.pak
67
%%DATADIR%%/game/thirdparty/cef3/locales/am.pak
68
%%DATADIR%%/game/thirdparty/cef3/locales/ar.pak
69
%%DATADIR%%/game/thirdparty/cef3/locales/bg.pak
70
%%DATADIR%%/game/thirdparty/cef3/locales/bn.pak
71
%%DATADIR%%/game/thirdparty/cef3/locales/ca.pak
72
%%DATADIR%%/game/thirdparty/cef3/locales/cs.pak
73
%%DATADIR%%/game/thirdparty/cef3/locales/da.pak
74
%%DATADIR%%/game/thirdparty/cef3/locales/de.pak
75
%%DATADIR%%/game/thirdparty/cef3/locales/el.pak
76
%%DATADIR%%/game/thirdparty/cef3/locales/en-GB.pak
77
%%DATADIR%%/game/thirdparty/cef3/locales/en-US.pak
78
%%DATADIR%%/game/thirdparty/cef3/locales/es-419.pak
79
%%DATADIR%%/game/thirdparty/cef3/locales/es.pak
80
%%DATADIR%%/game/thirdparty/cef3/locales/et.pak
81
%%DATADIR%%/game/thirdparty/cef3/locales/fa.pak
82
%%DATADIR%%/game/thirdparty/cef3/locales/fi.pak
83
%%DATADIR%%/game/thirdparty/cef3/locales/fil.pak
84
%%DATADIR%%/game/thirdparty/cef3/locales/fr.pak
85
%%DATADIR%%/game/thirdparty/cef3/locales/gu.pak
86
%%DATADIR%%/game/thirdparty/cef3/locales/he.pak
87
%%DATADIR%%/game/thirdparty/cef3/locales/hi.pak
88
%%DATADIR%%/game/thirdparty/cef3/locales/hr.pak
89
%%DATADIR%%/game/thirdparty/cef3/locales/hu.pak
90
%%DATADIR%%/game/thirdparty/cef3/locales/id.pak
91
%%DATADIR%%/game/thirdparty/cef3/locales/it.pak
92
%%DATADIR%%/game/thirdparty/cef3/locales/ja.pak
93
%%DATADIR%%/game/thirdparty/cef3/locales/kn.pak
94
%%DATADIR%%/game/thirdparty/cef3/locales/ko.pak
95
%%DATADIR%%/game/thirdparty/cef3/locales/lt.pak
96
%%DATADIR%%/game/thirdparty/cef3/locales/lv.pak
97
%%DATADIR%%/game/thirdparty/cef3/locales/ml.pak
98
%%DATADIR%%/game/thirdparty/cef3/locales/mr.pak
99
%%DATADIR%%/game/thirdparty/cef3/locales/ms.pak
100
%%DATADIR%%/game/thirdparty/cef3/locales/nb.pak
101
%%DATADIR%%/game/thirdparty/cef3/locales/nl.pak
102
%%DATADIR%%/game/thirdparty/cef3/locales/pl.pak
103
%%DATADIR%%/game/thirdparty/cef3/locales/pt-BR.pak
104
%%DATADIR%%/game/thirdparty/cef3/locales/pt-PT.pak
105
%%DATADIR%%/game/thirdparty/cef3/locales/ro.pak
106
%%DATADIR%%/game/thirdparty/cef3/locales/ru.pak
107
%%DATADIR%%/game/thirdparty/cef3/locales/sk.pak
108
%%DATADIR%%/game/thirdparty/cef3/locales/sl.pak
109
%%DATADIR%%/game/thirdparty/cef3/locales/sr.pak
110
%%DATADIR%%/game/thirdparty/cef3/locales/sv.pak
111
%%DATADIR%%/game/thirdparty/cef3/locales/sw.pak
112
%%DATADIR%%/game/thirdparty/cef3/locales/ta.pak
113
%%DATADIR%%/game/thirdparty/cef3/locales/te.pak
114
%%DATADIR%%/game/thirdparty/cef3/locales/th.pak
115
%%DATADIR%%/game/thirdparty/cef3/locales/tr.pak
116
%%DATADIR%%/game/thirdparty/cef3/locales/uk.pak
117
%%DATADIR%%/game/thirdparty/cef3/locales/vi.pak
118
%%DATADIR%%/game/thirdparty/cef3/locales/zh-CN.pak
119
%%DATADIR%%/game/thirdparty/cef3/locales/zh-TW.pak
66
%%DATADIR%%/game/thirdparty/config.lua
120
%%DATADIR%%/game/thirdparty/config.lua
67
%%DATADIR%%/game/thirdparty/jit/bc.lua
121
%%DATADIR%%/game/thirdparty/jit/bc.lua
68
%%DATADIR%%/game/thirdparty/jit/bcsave.lua
122
%%DATADIR%%/game/thirdparty/jit/bcsave.lua
Lines 74-79 Link Here
74
%%DATADIR%%/game/thirdparty/jit/dis_x86.lua
128
%%DATADIR%%/game/thirdparty/jit/dis_x86.lua
75
%%DATADIR%%/game/thirdparty/jit/dump.lua
129
%%DATADIR%%/game/thirdparty/jit/dump.lua
76
%%DATADIR%%/game/thirdparty/jit/v.lua
130
%%DATADIR%%/game/thirdparty/jit/v.lua
131
%%DATADIR%%/game/thirdparty/licenses/CEF3.txt
132
%%DATADIR%%/game/thirdparty/licenses/LuaJIT.txt
133
%%DATADIR%%/game/thirdparty/licenses/SDL.txt
134
%%DATADIR%%/game/thirdparty/licenses/SDL_image.txt
135
%%DATADIR%%/game/thirdparty/licenses/SDL_ttf.txt
136
%%DATADIR%%/game/thirdparty/licenses/expat.txt
137
%%DATADIR%%/game/thirdparty/licenses/freetype.txt
138
%%DATADIR%%/game/thirdparty/licenses/libogg.txt
139
%%DATADIR%%/game/thirdparty/licenses/libpng.txt
140
%%DATADIR%%/game/thirdparty/licenses/libvorbis.txt
141
%%DATADIR%%/game/thirdparty/licenses/lpeg.txt
142
%%DATADIR%%/game/thirdparty/licenses/luabitop.txt
143
%%DATADIR%%/game/thirdparty/licenses/luamd5.txt
144
%%DATADIR%%/game/thirdparty/licenses/luaprofiler.txt
145
%%DATADIR%%/game/thirdparty/licenses/luasocket.txt
146
%%DATADIR%%/game/thirdparty/licenses/luazlib.txt
147
%%DATADIR%%/game/thirdparty/licenses/lxp.txt
148
%%DATADIR%%/game/thirdparty/licenses/physfs.txt
149
%%DATADIR%%/game/thirdparty/licenses/tcod.txt
150
%%DATADIR%%/game/thirdparty/licenses/tween.txt
151
%%DATADIR%%/game/thirdparty/licenses/zlib.txt
77
%%DATADIR%%/game/thirdparty/lpeg/re.lua
152
%%DATADIR%%/game/thirdparty/lpeg/re.lua
78
%%DATADIR%%/game/thirdparty/ltn12.lua
153
%%DATADIR%%/game/thirdparty/ltn12.lua
79
%%DATADIR%%/game/thirdparty/lxp/lom.lua
154
%%DATADIR%%/game/thirdparty/lxp/lom.lua
Lines 93-98 Link Here
93
%%DATADIR%%/game/thirdparty/moonscript/util.lua
168
%%DATADIR%%/game/thirdparty/moonscript/util.lua
94
%%DATADIR%%/game/thirdparty/moonscript/version.lua
169
%%DATADIR%%/game/thirdparty/moonscript/version.lua
95
%%DATADIR%%/game/thirdparty/remdebug/engine.lua
170
%%DATADIR%%/game/thirdparty/remdebug/engine.lua
171
%%DATADIR%%/game/thirdparty/slt2.lua
96
%%DATADIR%%/game/thirdparty/socket.lua
172
%%DATADIR%%/game/thirdparty/socket.lua
97
%%DATADIR%%/game/thirdparty/socket/ftp.lua
173
%%DATADIR%%/game/thirdparty/socket/ftp.lua
98
%%DATADIR%%/game/thirdparty/socket/http.lua
174
%%DATADIR%%/game/thirdparty/socket/http.lua
Lines 99-147 Link Here
99
%%DATADIR%%/game/thirdparty/socket/smtp.lua
175
%%DATADIR%%/game/thirdparty/socket/smtp.lua
100
%%DATADIR%%/game/thirdparty/socket/tp.lua
176
%%DATADIR%%/game/thirdparty/socket/tp.lua
101
%%DATADIR%%/game/thirdparty/socket/url.lua
177
%%DATADIR%%/game/thirdparty/socket/url.lua
178
%%DATADIR%%/game/thirdparty/tween.lua
102
%%DATADIR%%/t-engine
179
%%DATADIR%%/t-engine
103
@dirrm %%DATADIR%%/game/thirdparty/socket
180
@dirrm %%DATADIR%%/bootstrap
104
@dirrm %%DATADIR%%/game/thirdparty/remdebug
181
@dirrm %%DATADIR%%/game/addons
105
@dirrm %%DATADIR%%/game/thirdparty/moonscript/compile
182
@dirrm %%DATADIR%%/game/engines
106
@dirrm %%DATADIR%%/game/thirdparty/moonscript
183
@dirrm %%DATADIR%%/game/loader
107
@dirrm %%DATADIR%%/game/thirdparty/lxp
184
@dirrm %%DATADIR%%/game/modules/example/class/interface
108
@dirrm %%DATADIR%%/game/thirdparty/lpeg
185
@dirrm %%DATADIR%%/game/modules/example/class
109
@dirrm %%DATADIR%%/game/thirdparty/jit
186
@dirrm %%DATADIR%%/game/modules/example/data/birth
110
@dirrm %%DATADIR%%/game/thirdparty
187
@dirrm %%DATADIR%%/game/modules/example/data/general/grids
111
@dirrm %%DATADIR%%/game/profile-thread
188
@dirrm %%DATADIR%%/game/modules/example/data/general/npcs
112
@dirrm %%DATADIR%%/game/modules/example_realtime/dialogs
189
@dirrm %%DATADIR%%/game/modules/example/data/general
190
@dirrm %%DATADIR%%/game/modules/example/data/gfx/particles
191
@dirrm %%DATADIR%%/game/modules/example/data/gfx
192
@dirrm %%DATADIR%%/game/modules/example/data/rooms
193
@dirrm %%DATADIR%%/game/modules/example/data/zones/dungeon
194
@dirrm %%DATADIR%%/game/modules/example/data/zones
195
@dirrm %%DATADIR%%/game/modules/example/data
196
@dirrm %%DATADIR%%/game/modules/example/dialogs
197
@dirrm %%DATADIR%%/game/modules/example
198
@dirrm %%DATADIR%%/game/modules/example_realtime/class/interface
199
@dirrm %%DATADIR%%/game/modules/example_realtime/class
200
@dirrm %%DATADIR%%/game/modules/example_realtime/data/birth
201
@dirrm %%DATADIR%%/game/modules/example_realtime/data/general/grids
202
@dirrm %%DATADIR%%/game/modules/example_realtime/data/general/npcs
203
@dirrm %%DATADIR%%/game/modules/example_realtime/data/general
204
@dirrm %%DATADIR%%/game/modules/example_realtime/data/gfx/particles
205
@dirrm %%DATADIR%%/game/modules/example_realtime/data/gfx
206
@dirrm %%DATADIR%%/game/modules/example_realtime/data/rooms
113
@dirrm %%DATADIR%%/game/modules/example_realtime/data/zones/dungeon
207
@dirrm %%DATADIR%%/game/modules/example_realtime/data/zones/dungeon
114
@dirrm %%DATADIR%%/game/modules/example_realtime/data/zones
208
@dirrm %%DATADIR%%/game/modules/example_realtime/data/zones
115
@dirrm %%DATADIR%%/game/modules/example_realtime/data/rooms
116
@dirrm %%DATADIR%%/game/modules/example_realtime/data/gfx/particles
117
@dirrm %%DATADIR%%/game/modules/example_realtime/data/gfx
118
@dirrm %%DATADIR%%/game/modules/example_realtime/data/general/npcs
119
@dirrm %%DATADIR%%/game/modules/example_realtime/data/general/grids
120
@dirrm %%DATADIR%%/game/modules/example_realtime/data/general
121
@dirrm %%DATADIR%%/game/modules/example_realtime/data/birth
122
@dirrm %%DATADIR%%/game/modules/example_realtime/data
209
@dirrm %%DATADIR%%/game/modules/example_realtime/data
123
@dirrm %%DATADIR%%/game/modules/example_realtime/class/interface
210
@dirrm %%DATADIR%%/game/modules/example_realtime/dialogs
124
@dirrm %%DATADIR%%/game/modules/example_realtime/class
125
@dirrm %%DATADIR%%/game/modules/example_realtime
211
@dirrm %%DATADIR%%/game/modules/example_realtime
126
@dirrm %%DATADIR%%/game/modules/example/dialogs
127
@dirrm %%DATADIR%%/game/modules/example/data/zones/dungeon
128
@dirrm %%DATADIR%%/game/modules/example/data/zones
129
@dirrm %%DATADIR%%/game/modules/example/data/rooms
130
@dirrm %%DATADIR%%/game/modules/example/data/gfx/particles
131
@dirrm %%DATADIR%%/game/modules/example/data/gfx
132
@dirrm %%DATADIR%%/game/modules/example/data/general/npcs
133
@dirrm %%DATADIR%%/game/modules/example/data/general/grids
134
@dirrm %%DATADIR%%/game/modules/example/data/general
135
@dirrm %%DATADIR%%/game/modules/example/data/birth
136
@dirrm %%DATADIR%%/game/modules/example/data
137
@dirrm %%DATADIR%%/game/modules/example/class/interface
138
@dirrm %%DATADIR%%/game/modules/example/class
139
@dirrm %%DATADIR%%/game/modules/example
140
@dirrm %%DATADIR%%/game/modules
212
@dirrm %%DATADIR%%/game/modules
141
@dirrm %%DATADIR%%/game/loader
213
@dirrm %%DATADIR%%/game/profile-thread
142
@dirrm %%DATADIR%%/game/engines/cores
214
@dirrm %%DATADIR%%/game/thirdparty/cef3/locales
143
@dirrm %%DATADIR%%/game/engines
215
@dirrm %%DATADIR%%/game/thirdparty/cef3
144
@dirrm %%DATADIR%%/game/addons
216
@dirrm %%DATADIR%%/game/thirdparty/jit
217
@dirrm %%DATADIR%%/game/thirdparty/licenses
218
@dirrm %%DATADIR%%/game/thirdparty/lpeg
219
@dirrm %%DATADIR%%/game/thirdparty/lxp
220
@dirrm %%DATADIR%%/game/thirdparty/moonscript/compile
221
@dirrm %%DATADIR%%/game/thirdparty/moonscript
222
@dirrm %%DATADIR%%/game/thirdparty/remdebug
223
@dirrm %%DATADIR%%/game/thirdparty/socket
224
@dirrm %%DATADIR%%/game/thirdparty
145
@dirrm %%DATADIR%%/game
225
@dirrm %%DATADIR%%/game
146
@dirrm %%DATADIR%%/bootstrap
147
@dirrm %%DATADIR%%
226
@dirrm %%DATADIR%%

Return to bug 190619