Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 130345 Details for
Bug 188454
ebuild using gdc for aba-game "tumiki fighters"
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
games-action/tumikifighters/files/tumikifighters-0.2.diff
tumikifighters-0.2.diff (text/plain), 42.85 KB, created by
Account removed
on 2007-09-08 15:39:18 UTC
(
hide
)
Description:
games-action/tumikifighters/files/tumikifighters-0.2.diff
Filename:
MIME Type:
Creator:
Account removed
Created:
2007-09-08 15:39:18 UTC
Size:
42.85 KB
patch
obsolete
>diff -Naur tf/import/opengl.d tf-gentoo/import/opengl.d >--- tf/import/opengl.d 2004-04-03 19:36:30.000000000 +0200 >+++ tf-gentoo/import/opengl.d 2007-09-08 17:05:49.000000000 +0200 >@@ -1116,7 +1116,7 @@ > /*************************************************************/ > > void /*APIENTRY*/glAccum (GLenum op, GLfloat value); >-void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref); >+void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf); > GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences); > void /*APIENTRY*/glArrayElement (GLint i); > void /*APIENTRY*/glBegin (GLenum mode); >@@ -1369,7 +1369,7 @@ > void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height); > void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer); > void /*APIENTRY*/glShadeModel (GLenum mode); >-void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref, GLuint mask); >+void /*APIENTRY*/glStencilFunc (GLenum func, GLint, GLuint mask); > void /*APIENTRY*/glStencilMask (GLuint mask); > void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); > void /*APIENTRY*/glTexCoord1d (GLdouble s); >diff -Naur tf/import/SDL.d tf-gentoo/import/SDL.d >--- tf/import/SDL.d 2004-04-03 19:36:30.000000000 +0200 >+++ tf-gentoo/import/SDL.d 2007-09-08 17:05:49.000000000 +0200 >@@ -20,18 +20,21 @@ > slouken@devolution.com > */ > >-import SDL_types; >-import SDL_getenv; >-import SDL_error; >-import SDL_rwops; >-import SDL_timer; >-import SDL_audio; >-import SDL_cdrom; >-import SDL_joystick; >-import SDL_events; >-import SDL_video; >-import SDL_byteorder; >-import SDL_version_; >+public import SDL_types; >+public import SDL_getenv; >+public import SDL_error; >+public import SDL_rwops; >+public import SDL_timer; >+public import SDL_audio; >+public import SDL_cdrom; >+public import SDL_joystick; >+public import SDL_events; >+public import SDL_video; >+public import SDL_byteorder; >+public import SDL_Version; >+public import SDL_Keysym; >+public import SDL_mouse; >+public import SDL_keyboard; > > extern(C): > >@@ -73,6 +76,7 @@ > */ > void SDL_Quit(); > >+/+ > void SDL_SetModuleHandle(void *hInst); > extern(Windows) void* GetModuleHandle(char*); > >@@ -88,3 +92,4 @@ > { > SDL_Quit(); > } >++/ >diff -Naur tf/import/SDL_endian.d tf-gentoo/import/SDL_endian.d >--- tf/import/SDL_endian.d 2004-04-03 19:36:30.000000000 +0200 >+++ tf-gentoo/import/SDL_endian.d 2007-09-08 17:05:49.000000000 +0200 >@@ -57,9 +57,9 @@ > Uint64 SDL_Swap64(Uint64 val) { > Uint32 hi, lo; > /* Separate into high and low 32-bit values and swap them */ >- lo = (Uint32)(val&0xFFFFFFFF); >+ lo = cast(Uint32)(val&0xFFFFFFFF); > val >>= 32; >- hi = (Uint32)(val&0xFFFFFFFF); >+ hi = cast(Uint32)(val&0xFFFFFFFF); > val = SDL_Swap32(lo); > val <<= 32; > val |= SDL_Swap32(hi); >diff -Naur tf/import/SDL_events.d tf-gentoo/import/SDL_events.d >--- tf/import/SDL_events.d 2004-04-03 19:36:30.000000000 +0200 >+++ tf-gentoo/import/SDL_events.d 2007-09-08 17:05:49.000000000 +0200 >@@ -304,7 +304,7 @@ > If 'state' is set to SDL_QUERY, SDL_EventState() will return the > current processing state of the specified event. > */ >-const uint SDL_QUERY = -1; >+const uint SDL_QUERY = cast(uint) -1; > const uint SDL_IGNORE = 0; > const uint SDL_DISABLE = 0; > const uint SDL_ENABLE = 1; >diff -Naur tf/import/SDL_getenv.d tf-gentoo/import/SDL_getenv.d >--- tf/import/SDL_getenv.d 2004-04-03 19:36:30.000000000 +0200 >+++ tf-gentoo/import/SDL_getenv.d 2007-09-08 17:05:49.000000000 +0200 >@@ -2,6 +2,7 @@ > > extern(C): > >+/+ > /* Put a variable of the form "name=value" into the environment */ > int SDL_putenv(char *variable); > int putenv(char* X) { return SDL_putenv(X); } >@@ -9,3 +10,4 @@ > /* Retrieve a variable named "name" from the environment */ > char *SDL_getenv(char *name); > char *getenv(char* X) { return SDL_getenv(X); } >++/ >diff -Naur tf/import/SDL_keyboard.d tf-gentoo/import/SDL_keyboard.d >--- tf/import/SDL_keyboard.d 2004-04-03 19:36:30.000000000 +0200 >+++ tf-gentoo/import/SDL_keyboard.d 2007-09-08 17:05:49.000000000 +0200 >@@ -26,7 +26,7 @@ > // !!! A hack! struct SDL_keysym is defined in this module, > // !!! so we need to resolve the nameclash... > // !!! Definitely won't work on *NIX but for now will do. >-import SDL_keysym_; >+import SDL_Keysym; > > extern(C): > >diff -Naur tf/import/SDL_keysym_.d tf-gentoo/import/SDL_keysym_.d >--- tf/import/SDL_keysym_.d 2004-04-03 19:36:30.000000000 +0200 >+++ tf-gentoo/import/SDL_keysym_.d 1970-01-01 01:00:00.000000000 +0100 >@@ -1,308 +0,0 @@ >-/* >- SDL - Simple DirectMedia Layer >- Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga >- >- This library is free software; you can redistribute it and/or >- modify it under the terms of the GNU Library General Public >- License as published by the Free Software Foundation; either >- version 2 of the License, or (at your option) any later version. >- >- This library is distributed in the hope that it will be useful, >- but WITHOUT ANY WARRANTY; without even the implied warranty of >- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- Library General Public License for more details. >- >- You should have received a copy of the GNU Library General Public >- License along with this library; if not, write to the Free >- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA >- >- Sam Lantinga >- slouken@devolution.com >-*/ >- >-/* What we really want is a mapping of every raw key on the keyboard. >- To support international keyboards, we use the range 0xA1 - 0xFF >- as international virtual keycodes. We'll follow in the footsteps of X11... >- The names of the keys >- */ >- >-alias int SDLKey; >-enum { >- /* The keyboard syms have been cleverly chosen to map to ASCII */ >- SDLK_UNKNOWN = 0, >- SDLK_FIRST = 0, >- SDLK_BACKSPACE = 8, >- SDLK_TAB = 9, >- SDLK_CLEAR = 12, >- SDLK_RETURN = 13, >- SDLK_PAUSE = 19, >- SDLK_ESCAPE = 27, >- SDLK_SPACE = 32, >- SDLK_EXCLAIM = 33, >- SDLK_QUOTEDBL = 34, >- SDLK_HASH = 35, >- SDLK_DOLLAR = 36, >- SDLK_AMPERSAND = 38, >- SDLK_QUOTE = 39, >- SDLK_LEFTPAREN = 40, >- SDLK_RIGHTPAREN = 41, >- SDLK_ASTERISK = 42, >- SDLK_PLUS = 43, >- SDLK_COMMA = 44, >- SDLK_MINUS = 45, >- SDLK_PERIOD = 46, >- SDLK_SLASH = 47, >- SDLK_0 = 48, >- SDLK_1 = 49, >- SDLK_2 = 50, >- SDLK_3 = 51, >- SDLK_4 = 52, >- SDLK_5 = 53, >- SDLK_6 = 54, >- SDLK_7 = 55, >- SDLK_8 = 56, >- SDLK_9 = 57, >- SDLK_COLON = 58, >- SDLK_SEMICOLON = 59, >- SDLK_LESS = 60, >- SDLK_EQUALS = 61, >- SDLK_GREATER = 62, >- SDLK_QUESTION = 63, >- SDLK_AT = 64, >- /* >- Skip uppercase letters >- */ >- SDLK_LEFTBRACKET = 91, >- SDLK_BACKSLASH = 92, >- SDLK_RIGHTBRACKET = 93, >- SDLK_CARET = 94, >- SDLK_UNDERSCORE = 95, >- SDLK_BACKQUOTE = 96, >- SDLK_a = 97, >- SDLK_b = 98, >- SDLK_c = 99, >- SDLK_d = 100, >- SDLK_e = 101, >- SDLK_f = 102, >- SDLK_g = 103, >- SDLK_h = 104, >- SDLK_i = 105, >- SDLK_j = 106, >- SDLK_k = 107, >- SDLK_l = 108, >- SDLK_m = 109, >- SDLK_n = 110, >- SDLK_o = 111, >- SDLK_p = 112, >- SDLK_q = 113, >- SDLK_r = 114, >- SDLK_s = 115, >- SDLK_t = 116, >- SDLK_u = 117, >- SDLK_v = 118, >- SDLK_w = 119, >- SDLK_x = 120, >- SDLK_y = 121, >- SDLK_z = 122, >- SDLK_DELETE = 127, >- /* End of ASCII mapped keysyms */ >- >- /* International keyboard syms */ >- SDLK_WORLD_0 = 160, /* 0xA0 */ >- SDLK_WORLD_1 = 161, >- SDLK_WORLD_2 = 162, >- SDLK_WORLD_3 = 163, >- SDLK_WORLD_4 = 164, >- SDLK_WORLD_5 = 165, >- SDLK_WORLD_6 = 166, >- SDLK_WORLD_7 = 167, >- SDLK_WORLD_8 = 168, >- SDLK_WORLD_9 = 169, >- SDLK_WORLD_10 = 170, >- SDLK_WORLD_11 = 171, >- SDLK_WORLD_12 = 172, >- SDLK_WORLD_13 = 173, >- SDLK_WORLD_14 = 174, >- SDLK_WORLD_15 = 175, >- SDLK_WORLD_16 = 176, >- SDLK_WORLD_17 = 177, >- SDLK_WORLD_18 = 178, >- SDLK_WORLD_19 = 179, >- SDLK_WORLD_20 = 180, >- SDLK_WORLD_21 = 181, >- SDLK_WORLD_22 = 182, >- SDLK_WORLD_23 = 183, >- SDLK_WORLD_24 = 184, >- SDLK_WORLD_25 = 185, >- SDLK_WORLD_26 = 186, >- SDLK_WORLD_27 = 187, >- SDLK_WORLD_28 = 188, >- SDLK_WORLD_29 = 189, >- SDLK_WORLD_30 = 190, >- SDLK_WORLD_31 = 191, >- SDLK_WORLD_32 = 192, >- SDLK_WORLD_33 = 193, >- SDLK_WORLD_34 = 194, >- SDLK_WORLD_35 = 195, >- SDLK_WORLD_36 = 196, >- SDLK_WORLD_37 = 197, >- SDLK_WORLD_38 = 198, >- SDLK_WORLD_39 = 199, >- SDLK_WORLD_40 = 200, >- SDLK_WORLD_41 = 201, >- SDLK_WORLD_42 = 202, >- SDLK_WORLD_43 = 203, >- SDLK_WORLD_44 = 204, >- SDLK_WORLD_45 = 205, >- SDLK_WORLD_46 = 206, >- SDLK_WORLD_47 = 207, >- SDLK_WORLD_48 = 208, >- SDLK_WORLD_49 = 209, >- SDLK_WORLD_50 = 210, >- SDLK_WORLD_51 = 211, >- SDLK_WORLD_52 = 212, >- SDLK_WORLD_53 = 213, >- SDLK_WORLD_54 = 214, >- SDLK_WORLD_55 = 215, >- SDLK_WORLD_56 = 216, >- SDLK_WORLD_57 = 217, >- SDLK_WORLD_58 = 218, >- SDLK_WORLD_59 = 219, >- SDLK_WORLD_60 = 220, >- SDLK_WORLD_61 = 221, >- SDLK_WORLD_62 = 222, >- SDLK_WORLD_63 = 223, >- SDLK_WORLD_64 = 224, >- SDLK_WORLD_65 = 225, >- SDLK_WORLD_66 = 226, >- SDLK_WORLD_67 = 227, >- SDLK_WORLD_68 = 228, >- SDLK_WORLD_69 = 229, >- SDLK_WORLD_70 = 230, >- SDLK_WORLD_71 = 231, >- SDLK_WORLD_72 = 232, >- SDLK_WORLD_73 = 233, >- SDLK_WORLD_74 = 234, >- SDLK_WORLD_75 = 235, >- SDLK_WORLD_76 = 236, >- SDLK_WORLD_77 = 237, >- SDLK_WORLD_78 = 238, >- SDLK_WORLD_79 = 239, >- SDLK_WORLD_80 = 240, >- SDLK_WORLD_81 = 241, >- SDLK_WORLD_82 = 242, >- SDLK_WORLD_83 = 243, >- SDLK_WORLD_84 = 244, >- SDLK_WORLD_85 = 245, >- SDLK_WORLD_86 = 246, >- SDLK_WORLD_87 = 247, >- SDLK_WORLD_88 = 248, >- SDLK_WORLD_89 = 249, >- SDLK_WORLD_90 = 250, >- SDLK_WORLD_91 = 251, >- SDLK_WORLD_92 = 252, >- SDLK_WORLD_93 = 253, >- SDLK_WORLD_94 = 254, >- SDLK_WORLD_95 = 255, /* 0xFF */ >- >- /* Numeric keypad */ >- SDLK_KP0 = 256, >- SDLK_KP1 = 257, >- SDLK_KP2 = 258, >- SDLK_KP3 = 259, >- SDLK_KP4 = 260, >- SDLK_KP5 = 261, >- SDLK_KP6 = 262, >- SDLK_KP7 = 263, >- SDLK_KP8 = 264, >- SDLK_KP9 = 265, >- SDLK_KP_PERIOD = 266, >- SDLK_KP_DIVIDE = 267, >- SDLK_KP_MULTIPLY = 268, >- SDLK_KP_MINUS = 269, >- SDLK_KP_PLUS = 270, >- SDLK_KP_ENTER = 271, >- SDLK_KP_EQUALS = 272, >- >- /* Arrows + Home/End pad */ >- SDLK_UP = 273, >- SDLK_DOWN = 274, >- SDLK_RIGHT = 275, >- SDLK_LEFT = 276, >- SDLK_INSERT = 277, >- SDLK_HOME = 278, >- SDLK_END = 279, >- SDLK_PAGEUP = 280, >- SDLK_PAGEDOWN = 281, >- >- /* Function keys */ >- SDLK_F1 = 282, >- SDLK_F2 = 283, >- SDLK_F3 = 284, >- SDLK_F4 = 285, >- SDLK_F5 = 286, >- SDLK_F6 = 287, >- SDLK_F7 = 288, >- SDLK_F8 = 289, >- SDLK_F9 = 290, >- SDLK_F10 = 291, >- SDLK_F11 = 292, >- SDLK_F12 = 293, >- SDLK_F13 = 294, >- SDLK_F14 = 295, >- SDLK_F15 = 296, >- >- /* Key state modifier keys */ >- SDLK_NUMLOCK = 300, >- SDLK_CAPSLOCK = 301, >- SDLK_SCROLLOCK = 302, >- SDLK_RSHIFT = 303, >- SDLK_LSHIFT = 304, >- SDLK_RCTRL = 305, >- SDLK_LCTRL = 306, >- SDLK_RALT = 307, >- SDLK_LALT = 308, >- SDLK_RMETA = 309, >- SDLK_LMETA = 310, >- SDLK_LSUPER = 311, /* Left "Windows" key */ >- SDLK_RSUPER = 312, /* Right "Windows" key */ >- SDLK_MODE = 313, /* "Alt Gr" key */ >- SDLK_COMPOSE = 314, /* Multi-key compose key */ >- >- /* Miscellaneous function keys */ >- SDLK_HELP = 315, >- SDLK_PRINT = 316, >- SDLK_SYSREQ = 317, >- SDLK_BREAK = 318, >- SDLK_MENU = 319, >- SDLK_POWER = 320, /* Power Macintosh power key */ >- SDLK_EURO = 321, /* Some european keyboards */ >- SDLK_UNDO = 322, /* Atari keyboard has Undo */ >- >- /* Add any other keys here */ >- >- SDLK_LAST >-} >- >-/* Enumeration of valid key mods (possibly OR'd together) */ >-alias int SDLMod; >-enum { >- KMOD_NONE = 0x0000, >- KMOD_LSHIFT= 0x0001, >- KMOD_RSHIFT= 0x0002, >- KMOD_LCTRL = 0x0040, >- KMOD_RCTRL = 0x0080, >- KMOD_LALT = 0x0100, >- KMOD_RALT = 0x0200, >- KMOD_LMETA = 0x0400, >- KMOD_RMETA = 0x0800, >- KMOD_NUM = 0x1000, >- KMOD_CAPS = 0x2000, >- KMOD_MODE = 0x4000, >- KMOD_RESERVED = 0x8000 >-} >- >-const uint KMOD_CTRL = (KMOD_LCTRL|KMOD_RCTRL); >-const uint KMOD_SHIFT = (KMOD_LSHIFT|KMOD_RSHIFT); >-const uint KMOD_ALT = (KMOD_LALT|KMOD_RALT); >-const uint KMOD_META = (KMOD_LMETA|KMOD_RMETA); >diff -Naur tf/import/SDL_Keysym.d tf-gentoo/import/SDL_Keysym.d >--- tf/import/SDL_Keysym.d 1970-01-01 01:00:00.000000000 +0100 >+++ tf-gentoo/import/SDL_Keysym.d 2007-09-08 17:05:49.000000000 +0200 >@@ -0,0 +1,308 @@ >+/* >+ SDL - Simple DirectMedia Layer >+ Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga >+ >+ This library is free software; you can redistribute it and/or >+ modify it under the terms of the GNU Library General Public >+ License as published by the Free Software Foundation; either >+ version 2 of the License, or (at your option) any later version. >+ >+ This library is distributed in the hope that it will be useful, >+ but WITHOUT ANY WARRANTY; without even the implied warranty of >+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ Library General Public License for more details. >+ >+ You should have received a copy of the GNU Library General Public >+ License along with this library; if not, write to the Free >+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA >+ >+ Sam Lantinga >+ slouken@devolution.com >+*/ >+ >+/* What we really want is a mapping of every raw key on the keyboard. >+ To support international keyboards, we use the range 0xA1 - 0xFF >+ as international virtual keycodes. We'll follow in the footsteps of X11... >+ The names of the keys >+ */ >+ >+alias int SDLKey; >+enum { >+ /* The keyboard syms have been cleverly chosen to map to ASCII */ >+ SDLK_UNKNOWN = 0, >+ SDLK_FIRST = 0, >+ SDLK_BACKSPACE = 8, >+ SDLK_TAB = 9, >+ SDLK_CLEAR = 12, >+ SDLK_RETURN = 13, >+ SDLK_PAUSE = 19, >+ SDLK_ESCAPE = 27, >+ SDLK_SPACE = 32, >+ SDLK_EXCLAIM = 33, >+ SDLK_QUOTEDBL = 34, >+ SDLK_HASH = 35, >+ SDLK_DOLLAR = 36, >+ SDLK_AMPERSAND = 38, >+ SDLK_QUOTE = 39, >+ SDLK_LEFTPAREN = 40, >+ SDLK_RIGHTPAREN = 41, >+ SDLK_ASTERISK = 42, >+ SDLK_PLUS = 43, >+ SDLK_COMMA = 44, >+ SDLK_MINUS = 45, >+ SDLK_PERIOD = 46, >+ SDLK_SLASH = 47, >+ SDLK_0 = 48, >+ SDLK_1 = 49, >+ SDLK_2 = 50, >+ SDLK_3 = 51, >+ SDLK_4 = 52, >+ SDLK_5 = 53, >+ SDLK_6 = 54, >+ SDLK_7 = 55, >+ SDLK_8 = 56, >+ SDLK_9 = 57, >+ SDLK_COLON = 58, >+ SDLK_SEMICOLON = 59, >+ SDLK_LESS = 60, >+ SDLK_EQUALS = 61, >+ SDLK_GREATER = 62, >+ SDLK_QUESTION = 63, >+ SDLK_AT = 64, >+ /* >+ Skip uppercase letters >+ */ >+ SDLK_LEFTBRACKET = 91, >+ SDLK_BACKSLASH = 92, >+ SDLK_RIGHTBRACKET = 93, >+ SDLK_CARET = 94, >+ SDLK_UNDERSCORE = 95, >+ SDLK_BACKQUOTE = 96, >+ SDLK_a = 97, >+ SDLK_b = 98, >+ SDLK_c = 99, >+ SDLK_d = 100, >+ SDLK_e = 101, >+ SDLK_f = 102, >+ SDLK_g = 103, >+ SDLK_h = 104, >+ SDLK_i = 105, >+ SDLK_j = 106, >+ SDLK_k = 107, >+ SDLK_l = 108, >+ SDLK_m = 109, >+ SDLK_n = 110, >+ SDLK_o = 111, >+ SDLK_p = 112, >+ SDLK_q = 113, >+ SDLK_r = 114, >+ SDLK_s = 115, >+ SDLK_t = 116, >+ SDLK_u = 117, >+ SDLK_v = 118, >+ SDLK_w = 119, >+ SDLK_x = 120, >+ SDLK_y = 121, >+ SDLK_z = 122, >+ SDLK_DELETE = 127, >+ /* End of ASCII mapped keysyms */ >+ >+ /* International keyboard syms */ >+ SDLK_WORLD_0 = 160, /* 0xA0 */ >+ SDLK_WORLD_1 = 161, >+ SDLK_WORLD_2 = 162, >+ SDLK_WORLD_3 = 163, >+ SDLK_WORLD_4 = 164, >+ SDLK_WORLD_5 = 165, >+ SDLK_WORLD_6 = 166, >+ SDLK_WORLD_7 = 167, >+ SDLK_WORLD_8 = 168, >+ SDLK_WORLD_9 = 169, >+ SDLK_WORLD_10 = 170, >+ SDLK_WORLD_11 = 171, >+ SDLK_WORLD_12 = 172, >+ SDLK_WORLD_13 = 173, >+ SDLK_WORLD_14 = 174, >+ SDLK_WORLD_15 = 175, >+ SDLK_WORLD_16 = 176, >+ SDLK_WORLD_17 = 177, >+ SDLK_WORLD_18 = 178, >+ SDLK_WORLD_19 = 179, >+ SDLK_WORLD_20 = 180, >+ SDLK_WORLD_21 = 181, >+ SDLK_WORLD_22 = 182, >+ SDLK_WORLD_23 = 183, >+ SDLK_WORLD_24 = 184, >+ SDLK_WORLD_25 = 185, >+ SDLK_WORLD_26 = 186, >+ SDLK_WORLD_27 = 187, >+ SDLK_WORLD_28 = 188, >+ SDLK_WORLD_29 = 189, >+ SDLK_WORLD_30 = 190, >+ SDLK_WORLD_31 = 191, >+ SDLK_WORLD_32 = 192, >+ SDLK_WORLD_33 = 193, >+ SDLK_WORLD_34 = 194, >+ SDLK_WORLD_35 = 195, >+ SDLK_WORLD_36 = 196, >+ SDLK_WORLD_37 = 197, >+ SDLK_WORLD_38 = 198, >+ SDLK_WORLD_39 = 199, >+ SDLK_WORLD_40 = 200, >+ SDLK_WORLD_41 = 201, >+ SDLK_WORLD_42 = 202, >+ SDLK_WORLD_43 = 203, >+ SDLK_WORLD_44 = 204, >+ SDLK_WORLD_45 = 205, >+ SDLK_WORLD_46 = 206, >+ SDLK_WORLD_47 = 207, >+ SDLK_WORLD_48 = 208, >+ SDLK_WORLD_49 = 209, >+ SDLK_WORLD_50 = 210, >+ SDLK_WORLD_51 = 211, >+ SDLK_WORLD_52 = 212, >+ SDLK_WORLD_53 = 213, >+ SDLK_WORLD_54 = 214, >+ SDLK_WORLD_55 = 215, >+ SDLK_WORLD_56 = 216, >+ SDLK_WORLD_57 = 217, >+ SDLK_WORLD_58 = 218, >+ SDLK_WORLD_59 = 219, >+ SDLK_WORLD_60 = 220, >+ SDLK_WORLD_61 = 221, >+ SDLK_WORLD_62 = 222, >+ SDLK_WORLD_63 = 223, >+ SDLK_WORLD_64 = 224, >+ SDLK_WORLD_65 = 225, >+ SDLK_WORLD_66 = 226, >+ SDLK_WORLD_67 = 227, >+ SDLK_WORLD_68 = 228, >+ SDLK_WORLD_69 = 229, >+ SDLK_WORLD_70 = 230, >+ SDLK_WORLD_71 = 231, >+ SDLK_WORLD_72 = 232, >+ SDLK_WORLD_73 = 233, >+ SDLK_WORLD_74 = 234, >+ SDLK_WORLD_75 = 235, >+ SDLK_WORLD_76 = 236, >+ SDLK_WORLD_77 = 237, >+ SDLK_WORLD_78 = 238, >+ SDLK_WORLD_79 = 239, >+ SDLK_WORLD_80 = 240, >+ SDLK_WORLD_81 = 241, >+ SDLK_WORLD_82 = 242, >+ SDLK_WORLD_83 = 243, >+ SDLK_WORLD_84 = 244, >+ SDLK_WORLD_85 = 245, >+ SDLK_WORLD_86 = 246, >+ SDLK_WORLD_87 = 247, >+ SDLK_WORLD_88 = 248, >+ SDLK_WORLD_89 = 249, >+ SDLK_WORLD_90 = 250, >+ SDLK_WORLD_91 = 251, >+ SDLK_WORLD_92 = 252, >+ SDLK_WORLD_93 = 253, >+ SDLK_WORLD_94 = 254, >+ SDLK_WORLD_95 = 255, /* 0xFF */ >+ >+ /* Numeric keypad */ >+ SDLK_KP0 = 256, >+ SDLK_KP1 = 257, >+ SDLK_KP2 = 258, >+ SDLK_KP3 = 259, >+ SDLK_KP4 = 260, >+ SDLK_KP5 = 261, >+ SDLK_KP6 = 262, >+ SDLK_KP7 = 263, >+ SDLK_KP8 = 264, >+ SDLK_KP9 = 265, >+ SDLK_KP_PERIOD = 266, >+ SDLK_KP_DIVIDE = 267, >+ SDLK_KP_MULTIPLY = 268, >+ SDLK_KP_MINUS = 269, >+ SDLK_KP_PLUS = 270, >+ SDLK_KP_ENTER = 271, >+ SDLK_KP_EQUALS = 272, >+ >+ /* Arrows + Home/End pad */ >+ SDLK_UP = 273, >+ SDLK_DOWN = 274, >+ SDLK_RIGHT = 275, >+ SDLK_LEFT = 276, >+ SDLK_INSERT = 277, >+ SDLK_HOME = 278, >+ SDLK_END = 279, >+ SDLK_PAGEUP = 280, >+ SDLK_PAGEDOWN = 281, >+ >+ /* Function keys */ >+ SDLK_F1 = 282, >+ SDLK_F2 = 283, >+ SDLK_F3 = 284, >+ SDLK_F4 = 285, >+ SDLK_F5 = 286, >+ SDLK_F6 = 287, >+ SDLK_F7 = 288, >+ SDLK_F8 = 289, >+ SDLK_F9 = 290, >+ SDLK_F10 = 291, >+ SDLK_F11 = 292, >+ SDLK_F12 = 293, >+ SDLK_F13 = 294, >+ SDLK_F14 = 295, >+ SDLK_F15 = 296, >+ >+ /* Key state modifier keys */ >+ SDLK_NUMLOCK = 300, >+ SDLK_CAPSLOCK = 301, >+ SDLK_SCROLLOCK = 302, >+ SDLK_RSHIFT = 303, >+ SDLK_LSHIFT = 304, >+ SDLK_RCTRL = 305, >+ SDLK_LCTRL = 306, >+ SDLK_RALT = 307, >+ SDLK_LALT = 308, >+ SDLK_RMETA = 309, >+ SDLK_LMETA = 310, >+ SDLK_LSUPER = 311, /* Left "Windows" key */ >+ SDLK_RSUPER = 312, /* Right "Windows" key */ >+ SDLK_MODE = 313, /* "Alt Gr" key */ >+ SDLK_COMPOSE = 314, /* Multi-key compose key */ >+ >+ /* Miscellaneous function keys */ >+ SDLK_HELP = 315, >+ SDLK_PRINT = 316, >+ SDLK_SYSREQ = 317, >+ SDLK_BREAK = 318, >+ SDLK_MENU = 319, >+ SDLK_POWER = 320, /* Power Macintosh power key */ >+ SDLK_EURO = 321, /* Some european keyboards */ >+ SDLK_UNDO = 322, /* Atari keyboard has Undo */ >+ >+ /* Add any other keys here */ >+ >+ SDLK_LAST >+} >+ >+/* Enumeration of valid key mods (possibly OR'd together) */ >+alias int SDLMod; >+enum { >+ KMOD_NONE = 0x0000, >+ KMOD_LSHIFT= 0x0001, >+ KMOD_RSHIFT= 0x0002, >+ KMOD_LCTRL = 0x0040, >+ KMOD_RCTRL = 0x0080, >+ KMOD_LALT = 0x0100, >+ KMOD_RALT = 0x0200, >+ KMOD_LMETA = 0x0400, >+ KMOD_RMETA = 0x0800, >+ KMOD_NUM = 0x1000, >+ KMOD_CAPS = 0x2000, >+ KMOD_MODE = 0x4000, >+ KMOD_RESERVED = 0x8000 >+} >+ >+const uint KMOD_CTRL = (KMOD_LCTRL|KMOD_RCTRL); >+const uint KMOD_SHIFT = (KMOD_LSHIFT|KMOD_RSHIFT); >+const uint KMOD_ALT = (KMOD_LALT|KMOD_RALT); >+const uint KMOD_META = (KMOD_LMETA|KMOD_RMETA); >diff -Naur tf/import/SDL_mixer.d tf-gentoo/import/SDL_mixer.d >--- tf/import/SDL_mixer.d 2004-04-03 19:36:30.000000000 +0200 >+++ tf-gentoo/import/SDL_mixer.d 2007-09-08 17:05:49.000000000 +0200 >@@ -22,7 +22,7 @@ > > // convert to D by shinichiro.h > >-/* $Id: SDL_mixer.d,v 1.1.1.1 2004/04/03 10:36:30 kenta Exp $ */ >+/* $Id: SDL_mixer.d,v 1.1.1.1 2005/06/18 00:46:00 kenta Exp $ */ > > import SDL; > >diff -Naur tf/import/SDL_mouse.d tf-gentoo/import/SDL_mouse.d >--- tf/import/SDL_mouse.d 2004-04-03 19:36:30.000000000 +0200 >+++ tf-gentoo/import/SDL_mouse.d 2007-09-08 17:05:49.000000000 +0200 >@@ -109,6 +109,8 @@ > const uint SDL_BUTTON_LEFT = 1; > const uint SDL_BUTTON_MIDDLE = 2; > const uint SDL_BUTTON_RIGHT = 3; >+const uint SDL_BUTTON_WHEELUP = 4; >+const uint SDL_BUTTON_WHEELDOWN = 5; > const uint SDL_BUTTON_LMASK = SDL_PRESSED << (SDL_BUTTON_LEFT - 1); > const uint SDL_BUTTON_MMASK = SDL_PRESSED << (SDL_BUTTON_MIDDLE - 1); > const uint SDL_BUTTON_RMASK = SDL_PRESSED << (SDL_BUTTON_RIGHT - 1); >diff -Naur tf/import/SDL_syswm.d tf-gentoo/import/SDL_syswm.d >--- tf/import/SDL_syswm.d 2004-04-03 19:36:30.000000000 +0200 >+++ tf-gentoo/import/SDL_syswm.d 2007-09-08 17:05:49.000000000 +0200 >@@ -22,7 +22,7 @@ > > /* Include file for SDL custom system window manager hooks */ > >-import SDL_version_; >+import SDL_Version; > > extern(C): > >diff -Naur tf/import/SDL_version_.d tf-gentoo/import/SDL_version_.d >--- tf/import/SDL_version_.d 2004-04-03 19:36:32.000000000 +0200 >+++ tf-gentoo/import/SDL_version_.d 1970-01-01 01:00:00.000000000 +0100 >@@ -1,75 +0,0 @@ >-/* >- SDL - Simple DirectMedia Layer >- Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga >- >- This library is free software; you can redistribute it and/or >- modify it under the terms of the GNU Library General Public >- License as published by the Free Software Foundation; either >- version 2 of the License, or (at your option) any later version. >- >- This library is distributed in the hope that it will be useful, >- but WITHOUT ANY WARRANTY; without even the implied warranty of >- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >- Library General Public License for more details. >- >- You should have received a copy of the GNU Library General Public >- License along with this library; if not, write to the Free >- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA >- >- Sam Lantinga >- slouken@devolution.com >-*/ >- >-/* This header defines the current SDL version */ >- >-import SDL_types; >- >-extern(C): >- >-/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL >-*/ >-const uint SDL_MAJOR_VERSION = 1; >-const uint SDL_MINOR_VERSION = 2; >-const uint SDL_PATCHLEVEL = 6; >- >-struct SDL_version { >- Uint8 major; >- Uint8 minor; >- Uint8 patch; >-} >- >-/* This macro can be used to fill a version structure with the compile-time >- * version of the SDL library. >- */ >-void SDL_VERSION(SDL_version* X) >-{ >- X.major = SDL_MAJOR_VERSION; >- X.minor = SDL_MINOR_VERSION; >- X.patch = SDL_PATCHLEVEL; >-} >- >-/* This macro turns the version numbers into a numeric value: >- (1,2,3) -> (1203) >- This assumes that there will never be more than 100 patchlevels >-*/ >-uint SDL_VERSIONNUM(Uint8 X, Uint8 Y, Uint8 Z) >-{ >- return X * 1000 + Y * 100 + Z; >-} >- >-/* This is the version number macro for the current SDL version */ >-const uint SDL_COMPILEDVERSION = SDL_MAJOR_VERSION * 1000 + >- SDL_MINOR_VERSION * 100 + >- SDL_PATCHLEVEL; >- >-/* This macro will evaluate to true if compiled with SDL at least X.Y.Z */ >-bit SDL_VERSION_ATLEAST(Uint8 X, Uint8 Y, Uint8 Z) >-{ >- return (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)); >-} >- >-/* This function gets the version of the dynamically linked SDL library. >- it should NOT be used to fill a version structure, instead you should >- use the SDL_Version() macro. >- */ >-SDL_version * SDL_Linked_Version(); >diff -Naur tf/import/SDL_Version.d tf-gentoo/import/SDL_Version.d >--- tf/import/SDL_Version.d 1970-01-01 01:00:00.000000000 +0100 >+++ tf-gentoo/import/SDL_Version.d 2007-09-08 17:05:49.000000000 +0200 >@@ -0,0 +1,75 @@ >+/* >+ SDL - Simple DirectMedia Layer >+ Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga >+ >+ This library is free software; you can redistribute it and/or >+ modify it under the terms of the GNU Library General Public >+ License as published by the Free Software Foundation; either >+ version 2 of the License, or (at your option) any later version. >+ >+ This library is distributed in the hope that it will be useful, >+ but WITHOUT ANY WARRANTY; without even the implied warranty of >+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >+ Library General Public License for more details. >+ >+ You should have received a copy of the GNU Library General Public >+ License along with this library; if not, write to the Free >+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA >+ >+ Sam Lantinga >+ slouken@devolution.com >+*/ >+ >+/* This header defines the current SDL version */ >+ >+import SDL_types; >+ >+extern(C): >+ >+/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL >+*/ >+const uint SDL_MAJOR_VERSION = 1; >+const uint SDL_MINOR_VERSION = 2; >+const uint SDL_PATCHLEVEL = 6; >+ >+struct SDL_version { >+ Uint8 major; >+ Uint8 minor; >+ Uint8 patch; >+} >+ >+/* This macro can be used to fill a version structure with the compile-time >+ * version of the SDL library. >+ */ >+void SDL_VERSION(SDL_version* X) >+{ >+ X.major = SDL_MAJOR_VERSION; >+ X.minor = SDL_MINOR_VERSION; >+ X.patch = SDL_PATCHLEVEL; >+} >+ >+/* This macro turns the version numbers into a numeric value: >+ (1,2,3) -> (1203) >+ This assumes that there will never be more than 100 patchlevels >+*/ >+uint SDL_VERSIONNUM(Uint8 X, Uint8 Y, Uint8 Z) >+{ >+ return X * 1000 + Y * 100 + Z; >+} >+ >+/* This is the version number macro for the current SDL version */ >+const uint SDL_COMPILEDVERSION = SDL_MAJOR_VERSION * 1000 + >+ SDL_MINOR_VERSION * 100 + >+ SDL_PATCHLEVEL; >+ >+/* This macro will evaluate to true if compiled with SDL at least X.Y.Z */ >+bit SDL_VERSION_ATLEAST(Uint8 X, Uint8 Y, Uint8 Z) >+{ >+ return (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)); >+} >+ >+/* This function gets the version of the dynamically linked SDL library. >+ it should NOT be used to fill a version structure, instead you should >+ use the SDL_Version() macro. >+ */ >+SDL_version * SDL_Linked_Version(); >diff -Naur tf/Makefile tf-gentoo/Makefile >--- tf/Makefile 1970-01-01 01:00:00.000000000 +0100 >+++ tf-gentoo/Makefile 2007-09-08 17:05:49.000000000 +0200 >@@ -0,0 +1,25 @@ >+DC=gdmd >+#DC=gdc >+ifeq ($(DC), gdmd) >+DFLAGS=-g -debug -O -Iimport -Isrc >+#DFLAGS=-g -debug -Iimport -Isrc >+DOUT=-of >+else >+DFLAGS=-O -debug -Iimport -Isrc >+#DFLAGS=-g -fdebug -Iimport -Isrc >+DOUT=-o >+endif >+ >+DSRC=$(shell find src/ -name "*.d") >+SOURCES=$(DSRC) import/SDL_video.d import/SDL_mixer.d >+OBJS=$(SOURCES:.d=.o) >+EXE=tumikifighters >+ >+all: $(EXE) >+ >+$(EXE): $(OBJS) >+ gcc -o $@ $(OBJS) -lbulletml_d -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer >+ >+$(OBJS): %.o: %.d >+ gdmd -d -c -of$@ $(DFLAGS) $< >+ >diff -Naur tf/src/abagames/tf/boot.d tf-gentoo/src/abagames/tf/boot.d >--- tf/src/abagames/tf/boot.d 2004-05-14 23:35:38.000000000 +0200 >+++ tf-gentoo/src/abagames/tf/boot.d 2007-09-08 17:05:49.000000000 +0200 >@@ -5,7 +5,7 @@ > */ > module abagames.tf.boot; > >-private import std.string; >+private import std.c.string; > private import std.c.stdlib; > private import abagames.util.logger; > private import abagames.util.sdl.mainloop; >diff -Naur tf/src/abagames/tf/enemy.d tf-gentoo/src/abagames/tf/enemy.d >--- tf/src/abagames/tf/enemy.d 2004-05-15 16:46:52.000000000 +0200 >+++ tf-gentoo/src/abagames/tf/enemy.d 2007-09-08 17:05:49.000000000 +0200 >@@ -142,13 +142,14 @@ > float speed; > Vector[] pt; > if (!mv.withdraw) { >- pt = mv.pattern.point[barragePtnIdx]; >- if (!pt) { >+// pt = mv.pattern.point[barragePtnIdx]; >+// if (!pt) >+ { > pt = mv.pattern.point[PointsMovePattern.BASIC_PATTERN_IDX]; > speed = mv.pattern.speed[PointsMovePattern.BASIC_PATTERN_IDX]; >- } else { >- speed = mv.pattern.speed[barragePtnIdx]; >- } >+ }// else { >+// speed = mv.pattern.speed[barragePtnIdx]; >+// } > if (!mv.reachFirstPointFirst) > speed *= 3; > else if (!mv.reachFirstPoint) >@@ -272,7 +273,7 @@ > if (attackPtnIdx >= af.attackPeriod.length) > attackPtnIdx = 0; > if (!mv.moveBullet) { >- if (mv.pattern.point[barragePtnIdx]) >+// if (mv.pattern.point[barragePtnIdx]) > movePatternChanged(); > } > } else if (fireCnt < af.breakPeriod[attackPtnIdx]) { >@@ -329,7 +330,7 @@ > if (ep.shield <= 0) { > if (ep.spec.damageToMainBody > 0) { > parts[0].shield -= ep.spec.damageToMainBody; >- particles.add(5, pos, 0, PI * 2, 0.1, parts[0].spec.size / 4, Particle.TypeName.SMOKE); >+ particles.add(5, pos, 0, PI * 2, 0.1, parts[0].spec.sizeof / 4, Particle.TypeName.SMOKE); > } > manager.addScore(ep.spec.tumikiSet.score, p); > if (ep.firstShield <= 1) >diff -Naur tf/src/abagames/tf/enemyspec.d tf-gentoo/src/abagames/tf/enemyspec.d >--- tf/src/abagames/tf/enemyspec.d 2004-05-14 23:35:38.000000000 +0200 >+++ tf-gentoo/src/abagames/tf/enemyspec.d 2007-09-08 17:05:49.000000000 +0200 >@@ -89,11 +89,10 @@ > } > > public static EnemySpec getInstance(char[] fileName) { >- EnemySpec inst = instances[fileName]; >+ EnemySpec inst; > if (!inst) { >- Logger.info("Load enemy spec: " ~ fileName); >- inst = new EnemySpec(fileName); >- instances[fileName] = inst; >+ inst = new EnemySpec(fileName); >+ instances[fileName] = inst; > } > return inst; > } >diff -Naur tf/src/abagames/tf/letterrender.d tf-gentoo/src/abagames/tf/letterrender.d >--- tf/src/abagames/tf/letterrender.d 2004-05-14 23:35:38.000000000 +0200 >+++ tf-gentoo/src/abagames/tf/letterrender.d 2007-09-08 17:05:49.000000000 +0200 >@@ -32,7 +32,7 @@ > return s * LETTER_HEIGHT; > } > >- private static void drawLetter(int n, float x, float y, float s, float d, int c) { >+ public static void drawLetter(int n, float x, float y, float s, float d, int c) { > glPushMatrix(); > glTranslatef(x, y, 0); > glScalef(s, s, s); >diff -Naur tf/src/abagames/tf/prefmanager.d tf-gentoo/src/abagames/tf/prefmanager.d >--- tf/src/abagames/tf/prefmanager.d 2004-05-14 23:35:38.000000000 +0200 >+++ tf-gentoo/src/abagames/tf/prefmanager.d 2007-09-08 17:05:49.000000000 +0200 >@@ -37,6 +37,11 @@ > auto File fd = new File; > try { > int ver; >+ // if (exists(PREF_FILE) == 0) >+{ >+ init(); >+ save(); >+ } > fd.open(PREF_FILE); > fd.read(ver); > if (ver != VERSION_NUM) >@@ -66,7 +71,7 @@ > break; > if (i >= RANKING_NUM) > return; >- for (int j = RANKING_NUM - 1; j > i; j--) >+ for (int j = RANKING_NUM - 1; j > i; j--) > ranking[j] = ranking[j - 1]; > ranking[i] = new RankingItem(sc, st); > } >diff -Naur tf/src/abagames/tf/ship.d tf-gentoo/src/abagames/tf/ship.d >--- tf/src/abagames/tf/ship.d 2004-05-15 16:46:52.000000000 +0200 >+++ tf-gentoo/src/abagames/tf/ship.d 2007-09-08 17:05:49.000000000 +0200 >@@ -70,7 +70,7 @@ > bool btnPrsd; > bool pullIn; > >- public static this() { >+ public this() { > rand = new Rand; > } > >diff -Naur tf/src/abagames/tf/tumikiset.d tf-gentoo/src/abagames/tf/tumikiset.d >--- tf/src/abagames/tf/tumikiset.d 2004-05-14 23:35:38.000000000 +0200 >+++ tf-gentoo/src/abagames/tf/tumikiset.d 2007-09-08 17:09:29.000000000 +0200 >@@ -6,7 +6,8 @@ > module abagames.tf.tumikiset; > > private import std.string; >-private import std.math; >+private import std.math; >+private import std.cstream; > private import abagames.util.vector; > private import abagames.util.csv; > private import abagames.util.iterator; >@@ -32,19 +33,19 @@ > static const char[] TUMIKI_DIR_NAME = "tumiki"; > static const float BULLET_SPEED_RATIO = 1.2; > static int[char[]] shapeStr; >- static char[][] SHAPE_STR = >+ static char[][] SHAPE_STR = > ["s", "ul", "ur", "dr", "dl", "u", "r", "d", "l", "pu", "pdr", "pr", "pur", "pd", "pf"]; > static int[char[]] colorStr; >- static char[][] COLOR_STR = >+ static char[][] COLOR_STR = > ["r", "g", "b", "y", "p", "a", "w", "gr"]; > static int[char[]] bulletShapeStr; >- static char[][] BULLET_SHAPE_STR = >+ static char[][] BULLET_SHAPE_STR = > ["b", "a", "r"]; > static int[char[]] bulletColorStr; >- static char[][] BULLET_COLOR_STR = >+ static char[][] BULLET_COLOR_STR = > ["r", "a", "p"]; > >- public static this() { >+ public static void randInit() { > int i = 0; > foreach (char[] s; SHAPE_STR) { > shapeStr[s] = i; >@@ -61,7 +62,8 @@ > i++; > } > i = 0; >- foreach (char[] s; BULLET_COLOR_STR) { >+ foreach (char[] s; BULLET_COLOR_STR) { >+ derr.writeLine("> s: " ~ std.string.toString(s)); > bulletColorStr[s] = i; > i++; > } >@@ -75,7 +77,8 @@ > // [BulletML, rank, speed]], > // (end when BulletML == e, shape == e)(set a empty barrage when shape == s), > // ], >- private this(char[][] data) { >+ public this(char[][] data) { >+ randInit(); > sizeXm = sizeYm = float.max; > sizeXp = sizeYp = float.min; > StringIterator si = new StringIterator(data); >@@ -87,9 +90,11 @@ > if (!si.hasNext) > break; > char[] v = si.next; >- int shape = shapeStr[v]; >+ int shape; >+ try { shape = shapeStr[v]; } catch (Exception e) {} > v = si.next; >- int color = colorStr[v]; >+ int color; >+ try { color = colorStr[v]; } catch (Exception e) {} > float x = atof(si.next); > float y = atof(si.next); > float sizex = atof(si.next); >@@ -111,9 +116,11 @@ > ti.addBarrage(new Barrage); > continue; > } >- int shape = bulletShapeStr[v]; >+ int shape; >+ try { shape = bulletShapeStr[v]; } catch (Exception e) {} > v = si.next; >- int color = bulletColorStr[v]; >+ int color; >+ try { color = bulletColorStr[v]; } catch (Exception e) {} > float size = atof(si.next); > float yReverse = atof(si.next); > int prevWait = atoi(si.next); >@@ -136,14 +143,15 @@ > } > > // Initialize TumikiSet from the file. >- private this(char[] fileName) { >+ public this(char[] fileName) { >+ randInit(); > Logger.info("Load tumiki set: " ~ fileName); > char[][] data = CSVTokenizer.readFile(TUMIKI_DIR_NAME ~ "/" ~ fileName); > this(data); > } > > public static TumikiSet getInstance(char[] fileName) { >- TumikiSet inst = instances[fileName]; >+ TumikiSet inst; // = instances[fileName]; > if (!inst) { > inst = new TumikiSet(fileName); > instances[fileName] = inst; >diff -Naur tf/src/abagames/tf/tumikiset.d~ tf-gentoo/src/abagames/tf/tumikiset.d~ >--- tf/src/abagames/tf/tumikiset.d~ 1970-01-01 01:00:00.000000000 +0100 >+++ tf-gentoo/src/abagames/tf/tumikiset.d~ 2007-09-08 17:05:49.000000000 +0200 >@@ -0,0 +1,222 @@ >+/* >+ * $Id: tumikiset.d,v 1.2 2004/05/14 14:35:38 kenta Exp $ >+ * >+ * Copyright 2004 Kenta Cho. All rights reserved. >+ */ >+module abagames.tf.tumikiset; >+ >+private import std.string; >+private import std.math; >+private import abagames.util.vector; >+private import abagames.util.csv; >+private import abagames.util.iterator; >+private import abagames.util.logger; >+private import abagames.util.actorpool; >+private import abagames.tf.tumiki; >+private import abagames.tf.bulletactor; >+private import abagames.tf.bulletactorpool; >+private import abagames.tf.enemy; >+private import abagames.tf.bullettarget; >+private import abagames.tf.fragment; >+ >+/** >+ * Manage the set of tumikis. >+ */ >+public class TumikiSet { >+ public: >+ Tumiki[] tumiki; >+ int score, fireScore, fireScoreInterval; >+ float sizeXm, sizeXp, sizeYm, sizeYp, size; >+ private: >+ static TumikiSet[char[]] instances; >+ static const char[] TUMIKI_DIR_NAME = "tumiki"; >+ static const float BULLET_SPEED_RATIO = 1.2; >+ static int[char[]] shapeStr; >+ static char[][] SHAPE_STR = >+ ["s", "ul", "ur", "dr", "dl", "u", "r", "d", "l", "pu", "pdr", "pr", "pur", "pd", "pf"]; >+ static int[char[]] colorStr; >+ static char[][] COLOR_STR = >+ ["r", "g", "b", "y", "p", "a", "w", "gr"]; >+ static int[char[]] bulletShapeStr; >+ static char[][] BULLET_SHAPE_STR = >+ ["b", "a", "r"]; >+ static int[char[]] bulletColorStr; >+ static char[][] BULLET_COLOR_STR = >+ ["r", "a", "p"]; >+ >+ public static void randInit() { >+ int i = 0; >+ foreach (char[] s; SHAPE_STR) { >+ shapeStr[s] = i; >+ i++; >+ } >+ i = 0; >+ foreach (char[] s; COLOR_STR) { >+ colorStr[s] = i; >+ i++; >+ } >+ i = 0; >+ foreach (char[] s; BULLET_SHAPE_STR) { >+ bulletShapeStr[s] = i; >+ i++; >+ } >+ i = 0; >+ foreach (char[] s; BULLET_COLOR_STR) { >+ bulletColorStr[s] = i; >+ i++; >+ } >+ } >+ >+ // Initialize TumikiSet with the array. >+ // sizeRatio, >+ // score, fireScore, fireScoreInterval, >+ // [shape, color, x, y, sizex, sizey, >+ // [shape, color, size, yReverse, prevWait, postWait, >+ // [BulletML, rank, speed]], >+ // (end when BulletML == e, shape == e)(set a empty barrage when shape == s), >+ // ], >+ public this(char[][] data) { >+ sizeXm = sizeYm = float.max; >+ sizeXp = sizeYp = float.min; >+ StringIterator si = new StringIterator(data); >+ float sizeRatio = atof(si.next); >+ score = atoi(si.next); >+ fireScore = atoi(si.next); >+ fireScoreInterval = atoi(si.next); >+ for (;;) { >+ if (!si.hasNext) >+ break; >+ char[] v = si.next; >+ int shape; >+ if(shapeStr.length !is 0) shape = shapeStr[v]; >+ v = si.next; >+ int color; >+ if(colorStr.length !is 0) color = colorStr[v]; >+ float x = atof(si.next); >+ float y = atof(si.next); >+ float sizex = atof(si.next); >+ float sizey = atof(si.next); >+ Tumiki ti = new Tumiki(shape, color, x, y, sizex, sizey, sizeRatio); >+ if (sizeXp < ti.ofs.x + ti.size.x) >+ sizeXp = ti.ofs.x + ti.size.x; >+ if (sizeXm > ti.ofs.x - ti.size.x) >+ sizeXm = ti.ofs.x - ti.size.x; >+ if (sizeYp < ti.ofs.y + ti.size.y) >+ sizeYp = ti.ofs.y + ti.size.y; >+ if (sizeYm > ti.ofs.y - ti.size.y) >+ sizeYm = ti.ofs.y - ti.size.y; >+ for (;;) { >+ v = si.next; >+ if (v == "e") { >+ break; >+ } else if (v == "s") { >+ ti.addBarrage(new Barrage); >+ continue; >+ } >+ int shape2; >+ if(bulletShapeStr.length !is 0) shape2 = bulletShapeStr[v]; >+ v = si.next; >+ int color2; >+ if(bulletColorStr.length !is 0) color2 = bulletColorStr[v]; >+ float size = atof(si.next); >+ float yReverse = atof(si.next); >+ int prevWait = atoi(si.next); >+ int postWait = atoi(si.next); >+ Barrage br = new Barrage >+ (shape2, color2, size, yReverse, prevWait, postWait); >+ for (;;) { >+ char[] bml = si.next; >+ if (bml == "e") >+ break; >+ float rank = atof(si.next); >+ float speed = atof(si.next); >+ br.addBml(bml, rank, speed * BULLET_SPEED_RATIO); >+ } >+ ti.addBarrage(br); >+ } >+ tumiki ~= ti; >+ } >+ size = -sizeXm + sizeXp - sizeYm + sizeYp; >+ } >+ >+ // Initialize TumikiSet from the file. >+ public this(char[] fileName) { >+ Logger.info("Load tumiki set: " ~ fileName); >+ char[][] data = CSVTokenizer.readFile(TUMIKI_DIR_NAME ~ "/" ~ fileName); >+ this(data); >+ } >+ >+ public static TumikiSet getInstance(char[] fileName) { >+ TumikiSet inst; // = instances[fileName]; >+ if (!inst) { >+ inst = new TumikiSet(fileName); >+ instances[fileName] = inst; >+ } >+ return inst; >+ } >+ >+ public int addTopBullets(int barragePtnIdx, BulletActorPool bullets, EnemyTopBullet[] etb, >+ BulletTarget target, int type) { >+ int etbIdx = 0; >+ foreach (Tumiki t; tumiki) { >+ BulletActor ba = t.addTopBullet(barragePtnIdx, bullets, target, type); >+ if (ba) { >+ etb[etbIdx].actor = ba; >+ etb[etbIdx].tumiki = t; >+ etb[etbIdx].deactivated = false; >+ etbIdx++; >+ } >+ } >+ return etbIdx; >+ } >+ >+ public void breakIntoFragments(ActorPool fragments, float x, float y, float d) { >+ foreach (Tumiki t; tumiki) { >+ float ox = t.ofs.x * cos(d) - t.ofs.y * sin(d); >+ float oy = t.ofs.x * sin(d) + t.ofs.y * cos(d); >+ Fragment fr = cast(Fragment) fragments.getInstanceForced(); >+ fr.set(t.shape, t.color, x + ox, y + oy, t.size); >+ } >+ } >+ >+ public void breakIntoFragments(ActorPool fragments, Vector pos, float d) { >+ breakIntoFragments(fragments, pos.x, pos.y, d); >+ } >+ >+ public void draw(Vector pos, float z, float deg) { >+ foreach (Tumiki t; tumiki) >+ t.draw(pos, z, 0, deg); >+ } >+ >+ public void drawShade(Vector pos, float z, int shade, float deg) { >+ foreach (Tumiki t; tumiki) >+ t.draw(pos, z, shade, deg); >+ } >+ >+ public void drawShade(Vector pos, float z, int shade, float deg, float size) { >+ foreach (Tumiki t; tumiki) >+ t.draw(pos, z, shade, deg, size); >+ } >+ >+ public void draw(Vector pos, float z) { >+ foreach (Tumiki t; tumiki) >+ t.draw(pos, z, 0); >+ } >+ >+ public void drawShade(Vector pos, float z, int shade) { >+ foreach (Tumiki t; tumiki) >+ t.draw(pos, z, shade); >+ } >+ >+ public void draw(float x, float y, float z, bool damaged, bool wounded) { >+ foreach (Tumiki t; tumiki) >+ t.draw(x, y, z, 0, damaged, wounded); >+ } >+ >+ public bool checkHit(Vector p, float x, float y) { >+ foreach (Tumiki t; tumiki) >+ if (t.checkHit(p, x, y)) >+ return true; >+ return false; >+ } >+} >diff -Naur tf/src/abagames/util/logger.d tf-gentoo/src/abagames/util/logger.d >--- tf/src/abagames/util/logger.d 2004-05-14 23:35:38.000000000 +0200 >+++ tf-gentoo/src/abagames/util/logger.d 2007-09-08 17:05:49.000000000 +0200 >@@ -5,7 +5,7 @@ > */ > module abagames.util.logger; > >-private import std.stream; >+private import std.cstream; > private import std.string; > > /** >@@ -53,27 +53,27 @@ > public class Logger { > > public static void info(char[] msg) { >- stderr.writeLine("Info: " ~ msg); >+ derr.writeLine("Info: " ~ msg); > } > > public static void info(int n) { >- stderr.writeLine("Info: " ~ std.string.toString(n)); >+ derr.writeLine("Info: " ~ std.string.toString(n)); > } > > public static void info(float n) { >- stderr.writeLine("Info: -" ~ std.string.toString(n)); >+ derr.writeLine("Info: -" ~ std.string.toString(n)); > } > > public static void error(char[] msg) { >- stderr.writeLine("Error: " ~ msg); >+ derr.writeLine("Error: " ~ msg); > } > > public static void error(Exception e) { >- stderr.writeLine("Error: " ~ e.toString()); >+ derr.writeLine("Error: " ~ e.toString()); > } > > public static void error(Error e) { >- stderr.writeLine("Error: " ~ e.toString()); >+ derr.writeLine("Error: " ~ e.toString()); > if (e.next) > error(e.next); > } >diff -Naur tf/src/dirent.d tf-gentoo/src/dirent.d >--- tf/src/dirent.d 1970-01-01 01:00:00.000000000 +0100 >+++ tf-gentoo/src/dirent.d 2007-09-08 17:05:49.000000000 +0200 >@@ -0,0 +1,10 @@ >+import std.string; >+ >+extern (C) { >+ alias void DIR; >+ alias void dirent; >+ DIR* opendir(char* name); >+ dirent* readdir(DIR* dir); >+ int closedir(DIR* dir); >+ char* readdir_filename(DIR* ent); >+}
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=130345">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 188454
:
127726
|
127727
|
128567
|
128993
|
128994
|
130345
|
131400
|
132756
|
136278
|
136280
|
181642
