Only in .: Makefile diff -u ../sdlquake-1.0.9/common.c ./common.c --- ../sdlquake-1.0.9/common.c 1999-12-25 09:38:02.000000000 -0200 +++ ./common.c 2008-05-10 09:48:56.000000000 -0300 @@ -1028,11 +1028,12 @@ if (h == -1) { #if WINDED - Sys_Error ("This dedicated server requires a full registered copy of Quake"); + //Sys_Error ("This dedicated server requires a full registered copy of Quake"); #endif + Cvar_Set ("cmdline", com_cmdline); Con_Printf ("Playing shareware version.\n"); - if (com_modified) - Sys_Error ("You must have the registered version to use modified games"); + //if (com_modified) + // Sys_Error ("You must have the registered version to use modified games"); return; } Only in .: config.cache Only in .: config.log Only in .: config.status Common subdirectories: ../sdlquake-1.0.9/data and ./data Common subdirectories: ../sdlquake-1.0.9/docs and ./docs diff -u ../sdlquake-1.0.9/draw.c ./draw.c --- ../sdlquake-1.0.9/draw.c 1999-12-21 21:53:24.000000000 -0200 +++ ./draw.c 2008-05-10 21:02:01.000000000 -0300 @@ -881,8 +881,8 @@ */ void Draw_BeginDisc (void) { - - D_BeginDirectRect (vid.width - 24, 0, draw_disc->data, 24, 24); + // Pipeline : Glitchy cause of SDL flickering on level loads + //D_BeginDirectRect (vid.width - 24, 0, draw_disc->data, 24, 24); } @@ -897,6 +897,7 @@ void Draw_EndDisc (void) { - D_EndDirectRect (vid.width - 24, 0, 24, 24); + // Pipeline : Glitchy cause of SDL flickering on level loads + //D_EndDirectRect (vid.width - 24, 0, 24, 24); } Common subdirectories: ../sdlquake-1.0.9/dxsdk and ./dxsdk Common subdirectories: ../sdlquake-1.0.9/gas2masm and ./gas2masm diff -u ../sdlquake-1.0.9/host.c ./host.c --- ../sdlquake-1.0.9/host.c 1999-12-21 21:53:24.000000000 -0200 +++ ./host.c 2008-05-11 02:27:08.000000000 -0300 @@ -81,6 +81,8 @@ cvar_t temp1 = {"temp1","0"}; +// Slow Motion Hack added for botmatches-- Code taken from www.machinima.com/article/view&id=88 +cvar_t true_timescale = { "true_timescale", "1.0"} ; // pipeline add /* ================ @@ -230,6 +232,8 @@ Cvar_RegisterVariable (&temp1); + Cvar_RegisterVariable (&true_timescale); // pipeline slow mo hack + Host_FindMaxClients (); host_time = 1.0; // so a think at time 0 won't get called @@ -506,8 +510,10 @@ return false; // framerate is too high host_frametime = realtime - oldrealtime; + host_frametime = host_frametime * true_timescale.value; // pipeline slo mo hack oldrealtime = realtime; + if (host_framerate.value > 0) host_frametime = host_framerate.value; else diff -u ../sdlquake-1.0.9/keys.c ./keys.c --- ../sdlquake-1.0.9/keys.c 1999-12-21 21:53:24.000000000 -0200 +++ ./keys.c 2008-05-10 16:39:27.000000000 -0300 @@ -63,6 +63,7 @@ {"DOWNARROW", K_DOWNARROW}, {"LEFTARROW", K_LEFTARROW}, {"RIGHTARROW", K_RIGHTARROW}, + {"ONE", "K_1"}, {"ALT", K_ALT}, {"CTRL", K_CTRL}, @@ -552,6 +553,7 @@ keyshift[i] = i; for (i='a' ; i<='z' ; i++) keyshift[i] = i - 'a' + 'A'; +/* pipeline interferes with shift hack in console keyshift['1'] = '!'; keyshift['2'] = '@'; keyshift['3'] = '#'; @@ -561,7 +563,7 @@ keyshift['7'] = '&'; keyshift['8'] = '*'; keyshift['9'] = '('; - keyshift['0'] = ')'; + keyshift['0'] = ')'; */ keyshift['-'] = '_'; keyshift['='] = '+'; keyshift[','] = '<'; @@ -613,6 +615,7 @@ return; // just catching keys for Con_NotifyBox } + // update auto-repeat status if (down) { @@ -626,8 +629,22 @@ Con_Printf ("%s is unbound, hit F4 to set.\n", Key_KeynumToString (key) ); } - if (key == K_SHIFT) - shift_down = down; + if (shift_down) { + if (key == 'q') key = '1'; + if (key == 'w') key = '2'; + if (key == 'e') key = '3'; + if (key == 'r') key = '4'; + if (key == 't') key = '5'; + if (key == 'y') key = '6'; + if (key == 'u') key = '7'; + if (key == 'i') key = '8'; + if (key == 'o') key = '9'; + if (key == 'p') key = '0'; + } + //Con_Printf ("%d pressed.", key); + + if (key == K_SHIFT) shift_down = down; + // // handle escape specialy, so the user can never unbind it Common subdirectories: ../sdlquake-1.0.9/kit and ./kit Only in .: maemo-sdlquake-1.0.9-rev38.diff diff -u ../sdlquake-1.0.9/menu.c ./menu.c --- ../sdlquake-1.0.9/menu.c 1999-12-21 21:53:24.000000000 -0200 +++ ./menu.c 2008-05-10 08:23:21.000000000 -0300 @@ -1658,6 +1658,7 @@ } break; + case 13 : // pipeline added Dpad Enter as response to Y/N questions case 'Y': case 'y': key_dest = key_console; diff -u ../sdlquake-1.0.9/net.h ./net.h --- ../sdlquake-1.0.9/net.h 1999-12-21 21:54:20.000000000 -0200 +++ ./net.h 2008-05-10 09:14:17.000000000 -0300 @@ -19,12 +19,26 @@ */ // net.h -- quake's interface to the networking layer +#include struct qsockaddr { - short sa_family; - unsigned char sa_data[14]; + short sa_family; + unsigned char sa_data[14]; + union { + struct { + u_char sa_len2; // total length + u_char sa_family2; // address family + char sa_data2[14]; // up to 14 bytes of direct address + } sa_generic; + } sa_union; }; +//struct qsockaddr +//{ +// short sa_family; +// unsigned char sa_data[14]; +//}; + #define NET_NAMELEN 64 @@ -238,7 +252,7 @@ extern int hostCacheCount; extern hostcache_t hostcache[HOSTCACHESIZE]; -#if !defined(_WIN32 ) && !defined (__linux__) && !defined (__sun__) +#if !defined(_WIN32 ) && !defined (__linux__) && !defined (__sun__) && 0 #ifndef htonl extern unsigned long htonl (unsigned long hostlong); #endif diff -u ../sdlquake-1.0.9/net_udp.c ./net_udp.c --- ../sdlquake-1.0.9/net_udp.c 1999-12-25 09:38:03.000000000 -0200 +++ ./net_udp.c 2008-05-10 09:09:40.000000000 -0300 @@ -138,6 +138,13 @@ if (ioctl (newsocket, FIONBIO, (char *)&_true) == -1) goto ErrorReturn; #endif + +#if 1 + int nonblocking = 1; + if (ioctl (newsocket, FIONBIO, &nonblocking) == -1) + goto ErrorReturn; +#endif + address.sin_family = AF_INET; address.sin_addr.s_addr = INADDR_ANY; address.sin_port = htons(port); @@ -213,6 +220,7 @@ port = net_hostport; hostaddr->sa_family = AF_INET; + ((struct sockaddr_in *)hostaddr)->sin_family = AF_INET; ((struct sockaddr_in *)hostaddr)->sin_port = htons((short)port); ((struct sockaddr_in *)hostaddr)->sin_addr.s_addr = (myAddr & htonl(mask)) | htonl(addr); @@ -245,7 +253,8 @@ int UDP_Read (int socket, byte *buf, int len, struct qsockaddr *addr) { - int addrlen = sizeof (struct qsockaddr); +// int addrlen = sizeof (struct qsockaddr); + int addrlen = sizeof (struct sockaddr); int ret; ret = recvfrom (socket, buf, len, 0, (struct sockaddr *)addr, &addrlen); @@ -295,7 +304,8 @@ { int ret; - ret = sendto (socket, buf, len, 0, (struct sockaddr *)addr, sizeof(struct qsockaddr)); + ret = sendto (socket, buf, len, 0, (struct sockaddr *)addr, sizeof(struct sockaddr)); +// ret = sendto (socket, buf, len, 0, (struct sockaddr *)addr, sizeof(struct qsockaddr)); if (ret == -1 && errno == EWOULDBLOCK) return 0; return ret; @@ -387,7 +397,10 @@ int UDP_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2) { if (addr1->sa_family != addr2->sa_family) - return -1; + { + return 0; //pipeline mod + //return -1; + } if (((struct sockaddr_in *)addr1)->sin_addr.s_addr != ((struct sockaddr_in *)addr2)->sin_addr.s_addr) return -1; Common subdirectories: ../sdlquake-1.0.9/scitech and ./scitech diff -u ../sdlquake-1.0.9/screen.c ./screen.c --- ../sdlquake-1.0.9/screen.c 1999-12-21 21:53:26.000000000 -0200 +++ ./screen.c 2008-05-10 21:03:35.000000000 -0300 @@ -762,12 +762,12 @@ { key_count = -1; // wait for a key down and up Sys_SendKeyEvents (); - } while (key_lastpress != 'y' && key_lastpress != 'n' && key_lastpress != K_ESCAPE); + } while (key_lastpress != 'y' && key_lastpress != K_UPARROW && key_lastpress != 'n' && key_lastpress != K_ESCAPE); scr_fullupdate = 0; SCR_UpdateScreen (); - return key_lastpress == 'y'; + return key_lastpress == 'y' || key_lastpress == K_UPARROW; } @@ -815,7 +815,7 @@ return; scr_copytop = 0; - scr_copyeverything = 0; + scr_copyeverything = 1; // pipeline mod if (scr_disabled_for_loading) { diff -u ../sdlquake-1.0.9/sys_linux.c ./sys_linux.c --- ../sdlquake-1.0.9/sys_linux.c 1999-04-19 17:47:52.000000000 -0300 +++ ./sys_linux.c 2008-05-10 08:19:22.000000000 -0300 @@ -24,7 +24,7 @@ int nostdout = 0; char *basedir = "."; -char *cachedir = "/tmp"; +char *cachedir = "/home/user"; cvar_t sys_linerefresh = {"sys_linerefresh","0"};// set for entity display diff -u ../sdlquake-1.0.9/sys_sdl.c ./sys_sdl.c --- ../sdlquake-1.0.9/sys_sdl.c 1999-12-25 10:14:37.000000000 -0200 +++ ./sys_sdl.c 2008-05-10 19:51:20.000000000 -0300 @@ -26,7 +26,7 @@ int noconinput = 0; char *basedir = "."; -char *cachedir = "/tmp"; +char *cachedir = ""; cvar_t sys_linerefresh = {"sys_linerefresh","0"};// set for entity display cvar_t sys_nostdout = {"sys_nostdout","0"}; @@ -374,12 +374,32 @@ extern int recording; static int frame; +//pipeline mods : why was there no -mem option?! + int j; +//end mod + moncontrol(0); // signal(SIGFPE, floating_point_exception_handler); signal(SIGFPE, SIG_IGN); - parms.memsize = 8*1024*1024; +//pipeline mods : -mem + COM_InitArgv(c, v); //moved up from below + parms.argc = com_argc; + parms.argv = com_argv; + + j = COM_CheckParm("-mem"); + if (j) { + parms.memsize = (int) (Q_atof(com_argv[j+1]) * 1024 * 1024); + //printf("Overri