Menu
▾
▴
jake2-commits — Jake2 cvs commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(52) |
Aug
(34) |
Sep
(99) |
Oct
(110) |
Nov
(21) |
Dec
(69) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(117) |
Feb
(90) |
Mar
(1) |
Apr
(22) |
May
(96) |
Jun
(25) |
Jul
(22) |
Aug
|
Sep
|
Oct
(18) |
Nov
(43) |
Dec
(71) |
| 2006 |
Jan
(20) |
Feb
(10) |
Mar
|
Apr
(4) |
May
(2) |
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
(60) |
Nov
(63) |
Dec
(35) |
| 2007 |
Jan
(18) |
Feb
(40) |
Mar
(14) |
Apr
(18) |
May
(33) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
(1) |
Mar
(25) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(15) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Rene S. <sa...@us...> - 2005-02-19 19:35:10
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5950/src/jake2/game Modified Files: Tag: RST GameTarget.java Log Message: lightramp bug and imroved laser think Index: GameTarget.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTarget.java,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** GameTarget.java 22 Sep 2004 19:22:03 -0000 1.3 --- GameTarget.java 19 Feb 2005 19:35:01 -0000 1.3.6.1 *************** *** 223,227 **** } ! if (GameBase.deathmatch.value != 9) { GameUtil.G_FreeEdict(self); return; --- 223,227 ---- } ! if (GameBase.deathmatch.value != 0) { GameUtil.G_FreeEdict(self); return; *************** *** 701,711 **** if (null == self.enemy) { if (self.target != null) { ! ent = GameBase.G_Find(null, GameBase.findByTarget, ! self.target).o; ! if (ent == null) GameBase.gi.dprintf(self.classname + " at " + Lib.vtos(self.s.origin) + ": " + self.target + " is a bad target\n"); ! self.enemy = ent; } else { GameBase.G_SetMovedir(self.s.angles, self.movedir); --- 701,711 ---- if (null == self.enemy) { if (self.target != null) { ! EdictIterator edit = GameBase.G_Find(null, GameBase.findByTarget, ! self.target); ! if (edit == null) GameBase.gi.dprintf(self.classname + " at " + Lib.vtos(self.s.origin) + ": " + self.target + " is a bad target\n"); ! self.enemy = edit.o; } else { GameBase.G_SetMovedir(self.s.angles, self.movedir); *************** *** 741,751 **** public boolean think(edict_t self) { ! char style[] = { ' ', ' ' }; ! ! style[0] = (char) ('a' + (int) (self.movedir[0] + (GameBase.level.time - self.timestamp) ! / Defines.FRAMETIME * self.movedir[2])); ! style[1] = 0; GameBase.gi.configstring(Defines.CS_LIGHTS + self.enemy.style, ! new String(style)); if ((GameBase.level.time - self.timestamp) < self.speed) { --- 741,749 ---- public boolean think(edict_t self) { ! char tmp[] = {(char) ('a' + (int) (self.movedir[0] + (GameBase.level.time - self.timestamp) ! / Defines.FRAMETIME * self.movedir[2]))}; ! GameBase.gi.configstring(Defines.CS_LIGHTS + self.enemy.style, ! new String(tmp)); if ((GameBase.level.time - self.timestamp) < self.speed) { *************** *** 776,783 **** es = GameBase .G_Find(es, GameBase.findByTarget, self.target); e = es.o; - if (e == null) - break; if (Lib.strcmp(e.classname, "light") != 0) { GameBase.gi.dprintf(self.classname + " at " --- 774,783 ---- es = GameBase .G_Find(es, GameBase.findByTarget, self.target); + + if (es == null) + break; + e = es.o; if (Lib.strcmp(e.classname, "light") != 0) { GameBase.gi.dprintf(self.classname + " at " |
|
From: Rene S. <sa...@us...> - 2005-02-19 19:34:15
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5673/src/jake2/server Modified Files: Tag: RST SV_INIT.java Log Message: cosmetic Index: SV_INIT.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_INIT.java,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -C2 -d -r1.10.2.1 -r1.10.2.2 *** SV_INIT.java 6 Feb 2005 10:56:54 -0000 1.10.2.1 --- SV_INIT.java 19 Feb 2005 19:33:48 -0000 1.10.2.2 *************** *** 60,68 **** Com.Error(Defines.ERR_DROP, "*Index: overflow"); - //strncpy (sv.configstrings[start+i], name, - // sizeof(sv.configstrings[i])); sv.configstrings[start + i] = name; ! if (sv.state != Defines.ss_loading) { // send the update to everyone SZ.Clear(sv.multicast); MSG.WriteChar(sv.multicast, Defines.svc_configstring); --- 60,67 ---- Com.Error(Defines.ERR_DROP, "*Index: overflow"); sv.configstrings[start + i] = name; ! if (sv.state != Defines.ss_loading) { ! // send the update to everyone SZ.Clear(sv.multicast); MSG.WriteChar(sv.multicast, Defines.svc_configstring); *************** *** 109,115 **** svent.s.number = entnum; - // // take current state as baseline - // Math3D.VectorCopy(svent.s.origin, svent.s.old_origin); // rst: bugfix --- 108,112 ---- *************** *** 154,158 **** SV_CCMDS.SV_ReadLevelFile(); ! if (!sv.loadgame) { // coming back to a level after being in a different // level, so run it for ten seconds --- 151,156 ---- SV_CCMDS.SV_ReadLevelFile(); ! if (!sv.loadgame) { ! // coming back to a level after being in a different // level, so run it for ten seconds |
|
From: Rene S. <sa...@us...> - 2005-02-19 19:33:11
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5455/src/jake2/qcommon Modified Files: Tag: RST MSG.java Log Message: turned off debug msg Index: MSG.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/MSG.java,v retrieving revision 1.5.6.1 retrieving revision 1.5.6.2 diff -C2 -d -r1.5.6.1 -r1.5.6.2 *** MSG.java 23 Jan 2005 21:31:17 -0000 1.5.6.1 --- MSG.java 19 Feb 2005 19:33:02 -0000 1.5.6.2 *************** *** 88,92 **** SZ.Write(sb, x.getBytes()); WriteByte(sb, 0); ! Com.dprintln("MSG.WriteString:" + s.replace('\0', '@')); } --- 88,92 ---- SZ.Write(sb, x.getBytes()); WriteByte(sb, 0); ! //Com.dprintln("MSG.WriteString:" + s.replace('\0', '@')); } *************** *** 477,481 **** String ret = new String(readbuf, 0, l); ! Com.dprintln("MSG.ReadString:[" + ret + "]"); return ret; } --- 477,481 ---- String ret = new String(readbuf, 0, l); ! //Com.dprintln("MSG.ReadString:[" + ret + "]"); return ret; } |
|
From: Rene S. <sa...@us...> - 2005-02-19 19:32:41
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5306/src/jake2/client Modified Files: Tag: RST CL_parse.java Log Message: turned off debug msg Index: CL_parse.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -C2 -d -r1.18.2.1 -r1.18.2.2 *** CL_parse.java 23 Jan 2005 21:31:26 -0000 1.18.2.1 --- CL_parse.java 19 Feb 2005 19:32:29 -0000 1.18.2.2 *************** *** 532,536 **** Globals.cl.configstrings[i] = s; ! Com.dprintln("ParseConfigString(): configstring[" + i + "]=<"+s+">"); // do something apropriate --- 532,536 ---- Globals.cl.configstrings[i] = s; ! //Com.dprintln("ParseConfigString(): configstring[" + i + "]=<"+s+">"); // do something apropriate |
|
From: Rene S. <sa...@us...> - 2005-02-19 11:13:08
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18589/src/jake2/qcommon Modified Files: Cbuf.java Log Message: command line parameter bugs. Index: Cbuf.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Cbuf.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Cbuf.java 17 Jan 2005 21:54:38 -0000 1.6 --- Cbuf.java 19 Feb 2005 11:12:42 -0000 1.7 *************** *** 117,125 **** i++; ! for (j = i; (text.charAt(j) != '+') && (text.charAt(j) != '-') ! && j < text.length(); j++) ! ; ! build += text.substring(i, j - 1); build += "\n"; --- 117,123 ---- i++; ! for (j = i; j < text.length() && (text.charAt(j) != '+') && (text.charAt(j) != '-'); j++); ! build += text.substring(i, j); build += "\n"; |
|
From: Rene S. <sa...@us...> - 2005-02-13 19:22:18
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6670/src/jake2/game Modified Files: GameWeapon.java Log Message: bug: weapons were not loud enough Index: GameWeapon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameWeapon.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameWeapon.java 22 Sep 2004 19:22:02 -0000 1.3 --- GameWeapon.java 13 Feb 2005 19:22:09 -0000 1.4 *************** *** 43,47 **** if (type == Defines.PNOISE_WEAPON) { ! if (who.client.silencer_shots == 0) { who.client.silencer_shots--; return; --- 43,47 ---- if (type == Defines.PNOISE_WEAPON) { ! if (who.client.silencer_shots > 0) { who.client.silencer_shots--; return; |
|
From: Carsten W. <ca...@us...> - 2005-02-13 17:13:05
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9983/src/jake2/qcommon Modified Files: Qcommon.java Log Message: dedicated server runs now :-) someone has forgotten the code to check the dedicated variable. (stupid bug and hard to find) Index: Qcommon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Qcommon.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Qcommon.java 6 Feb 2005 19:26:11 -0000 1.14 --- Qcommon.java 13 Feb 2005 17:12:55 -0000 1.15 *************** *** 119,123 **** if (!Cbuf.AddLateCommands()) { // if the user didn't give any commands, run default action ! Cbuf.AddText("d1\n"); Cbuf.Execute(); } else { --- 119,127 ---- if (!Cbuf.AddLateCommands()) { // if the user didn't give any commands, run default action ! if (Globals.dedicated.value == 0) ! Cbuf.AddText ("d1\n"); ! else ! Cbuf.AddText ("dedicated_start\n"); ! Cbuf.Execute(); } else { |
|
From: Carsten W. <ca...@us...> - 2005-02-13 17:03:56
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6129/src/jake2/game Modified Files: GameSave.java Log Message: GameBase.dedicated removed; use Globals.dedicated instead (defined twice) Index: GameSave.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSave.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GameSave.java 22 Sep 2004 19:22:01 -0000 1.7 --- GameSave.java 13 Feb 2005 17:03:43 -0000 1.8 *************** *** 64,68 **** // noset vars ! GameBase.dedicated = GameBase.gi.cvar("dedicated", "0", Defines.CVAR_NOSET); --- 64,68 ---- // noset vars ! Globals.dedicated = GameBase.gi.cvar("dedicated", "0", Defines.CVAR_NOSET); |
|
From: Carsten W. <ca...@us...> - 2005-02-13 17:03:00
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5733/src/jake2/game Modified Files: GameBase.java Cmd.java Log Message: GameBase.dedicated removed; use Globals.dedicated instead (defined twice) Index: GameBase.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameBase.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** GameBase.java 22 Sep 2004 19:22:05 -0000 1.8 --- GameBase.java 13 Feb 2005 17:02:45 -0000 1.9 *************** *** 84,89 **** public static cvar_t g_select_empty = new cvar_t(); - public static cvar_t dedicated = new cvar_t(); - public static cvar_t filterban = new cvar_t(); --- 84,87 ---- Index: Cmd.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/Cmd.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Cmd.java 6 Feb 2005 18:53:50 -0000 1.11 --- Cmd.java 13 Feb 2005 17:02:46 -0000 1.12 *************** *** 1119,1123 **** } ! if (GameBase.dedicated.value != 0) SV_GAME.PF_cprintf(null, Defines.PRINT_CHAT, "" + text + ""); --- 1119,1123 ---- } ! if (Globals.dedicated.value != 0) SV_GAME.PF_cprintf(null, Defines.PRINT_CHAT, "" + text + ""); |
|
From: Rene S. <sa...@us...> - 2005-02-12 21:43:57
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31895/src/jake2/server Modified Files: SV_INIT.java Log Message: beatification Index: SV_INIT.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_INIT.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SV_INIT.java 6 Feb 2005 19:27:24 -0000 1.11 --- SV_INIT.java 12 Feb 2005 21:43:48 -0000 1.12 *************** *** 356,363 **** } ! svs.spawncount = Lib.rand(); ! //svs.clients = Z_Malloc(sizeof(client_t) * maxclients.value); svs.clients = new client_t[(int) SV_MAIN.maxclients.value]; for (int n = 0; n < svs.clients.length; n++) { svs.clients[n] = new client_t(); svs.clients[n].serverindex = n; --- 356,363 ---- } ! svs.spawncount = Lib.rand(); svs.clients = new client_t[(int) SV_MAIN.maxclients.value]; for (int n = 0; n < svs.clients.length; n++) { + // fixed nasty multiplayer bug (rst). svs.clients[n] = new client_t(); svs.clients[n].serverindex = n; |
|
From: Rene S. <sa...@us...> - 2005-02-12 21:43:11
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31554/src/jake2/game Modified Files: PlayerClient.java Log Message: beatification Index: PlayerClient.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/PlayerClient.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PlayerClient.java 6 Feb 2005 19:10:48 -0000 1.7 --- PlayerClient.java 12 Feb 2005 21:43:02 -0000 1.8 *************** *** 536,550 **** if (target == null) target = ""; ! if (Lib.Q_stricmp(GameBase.game.spawnpoint, target) == 0) { // this ! // is a ! // coop ! // spawn ! // point ! // for ! // one ! // of ! // the ! // clients ! // here index--; if (0 == index) --- 536,541 ---- if (target == null) target = ""; ! if (Lib.Q_stricmp(GameBase.game.spawnpoint, target) == 0) { ! // this is a coop spawn point for one of the clients here index--; if (0 == index) |
|
From: Carsten W. <ca...@us...> - 2005-02-09 20:47:44
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6112/src/jake2/client Modified Files: Menu.java Log Message: bugfix: 1119453 thank you very much "deathmeat" Index: Menu.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Menu.java 20 Jan 2005 23:15:23 -0000 1.17 --- Menu.java 9 Feb 2005 20:47:30 -0000 1.18 *************** *** 3575,3593 **** static void AddressBook_MenuInit() { - int i; - s_addressbook_menu.x = viddef.width / 2 - 142; s_addressbook_menu.y = viddef.height / 2 - 58; s_addressbook_menu.nitems = 0; ! for (i = 0; i < NUM_ADDRESSBOOK_ENTRIES; i++) { ! cvar_t adr; ! //char buffer[20]; ! String buffer; ! ! //Com_sprintf(buffer, sizeof(buffer), "adr%d", i); ! buffer = "adr" + i; ! ! adr = Cvar.Get(buffer, "", CVAR_ARCHIVE); s_addressbook_fields[i].type = MTYPE_FIELD; --- 3575,3584 ---- static void AddressBook_MenuInit() { s_addressbook_menu.x = viddef.width / 2 - 142; s_addressbook_menu.y = viddef.height / 2 - 58; s_addressbook_menu.nitems = 0; ! for (int i = 0; i < NUM_ADDRESSBOOK_ENTRIES; i++) { ! cvar_t adr = Cvar.Get("adr" + i, "", CVAR_ARCHIVE); s_addressbook_fields[i].type = MTYPE_FIELD; *************** *** 3597,3601 **** s_addressbook_fields[i].y = i * 18 + 0; s_addressbook_fields[i].localdata[0] = i; ! s_addressbook_fields[i].cursor = 0; s_addressbook_fields[i].length = 60; s_addressbook_fields[i].visible_length = 30; --- 3588,3593 ---- s_addressbook_fields[i].y = i * 18 + 0; s_addressbook_fields[i].localdata[0] = i; ! // put the cursor to the end of text for editing ! s_addressbook_fields[i].cursor = adr.string.length(); s_addressbook_fields[i].length = 60; s_addressbook_fields[i].visible_length = 30; *************** *** 3615,3626 **** static String AddressBook_MenuKey_f(int key) { if (key == K_ESCAPE) { ! int index; ! //char buffer[20]; ! String buffer; ! ! for (index = 0; index < NUM_ADDRESSBOOK_ENTRIES; index++) { ! buffer = "adr" + index; ! //Com_sprintf(buffer, sizeof(buffer), "adr%d", index); ! Cvar.Set(buffer, s_addressbook_fields[index].buffer.toString()); } } --- 3607,3612 ---- static String AddressBook_MenuKey_f(int key) { if (key == K_ESCAPE) { ! for (int index = 0; index < NUM_ADDRESSBOOK_ENTRIES; index++) { ! Cvar.Set("adr" + index, s_addressbook_fields[index].buffer.toString()); } } |
|
From: Carsten W. <ca...@us...> - 2005-02-09 09:21:21
|
Update of /cvsroot/jake2/jake2/test/jake2/render In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32731/test/jake2/render Modified Files: DancingQueens.java Log Message: changes to hanlde the new renderer interface (keyboardhandler) Index: DancingQueens.java =================================================================== RCS file: /cvsroot/jake2/jake2/test/jake2/render/DancingQueens.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DancingQueens.java 14 Dec 2004 01:08:32 -0000 1.6 --- DancingQueens.java 9 Feb 2005 09:21:10 -0000 1.7 *************** *** 65,71 **** } void init() { ! Qcommon.Init(new String[] {"DancingQueens"}); // sehr wichtig !!! VID.Shutdown(); --- 65,73 ---- } + KBD kbd; + void init() { ! Qcommon.Init(new String[] {"DancingQueens", "+set", "s_initsound", "0", "+set", "vid_ref", "lwjgl"}); // sehr wichtig !!! VID.Shutdown(); *************** *** 74,78 **** System.out.println("Registered Drivers: " + Arrays.asList(names)); ! this.re = Renderer.getDriver("fastjogl"); System.out.println("Use driver: " + re); --- 76,80 ---- System.out.println("Registered Drivers: " + Arrays.asList(names)); ! this.re = Renderer.getDriver("lwjgl"); System.out.println("Use driver: " + re); *************** *** 80,83 **** --- 82,87 ---- re.Init(0, 0); + kbd = re.getKeyboardHandler(); + kbd.Init(); Cmd.AddCommand("togglemouse", togglemouse); *************** *** 127,131 **** { re.updateScreen(callback); ! re.getKeyboardHandler().Update(); Cbuf.Execute(); } --- 131,135 ---- { re.updateScreen(callback); ! kbd.Update(); Cbuf.Execute(); } |
|
From: Carsten W. <ca...@us...> - 2005-02-08 21:48:52
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16325/src/jake2/client Modified Files: CL.java Log Message: bugfix: don't force GC on playing a cinematic. the error was triggered at the end of the demo levels. toggle between "The End" and the menu worked fine but the menu animation was very slow. The reason was a Full-GC every frame. Index: CL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** CL.java 7 Feb 2005 22:14:38 -0000 1.19 --- CL.java 8 Feb 2005 21:48:21 -0000 1.20 *************** *** 1560,1564 **** CL_view.PrepRefresh(); // force GC after level loading ! System.gc(); } --- 1560,1565 ---- CL_view.PrepRefresh(); // force GC after level loading ! // but not on playing a cinematic ! if (Globals.cl.cinematictime == 0) System.gc(); } |
|
From: Carsten W. <ca...@us...> - 2005-02-08 20:34:04
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17325/src/jake2/client Modified Files: SCR.java Log Message: now it can handle simple static pcx images (see the end) not fully complete yet (first hack :-) Index: SCR.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/SCR.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** SCR.java 7 Feb 2005 17:38:57 -0000 1.13 --- SCR.java 8 Feb 2005 20:33:33 -0000 1.14 *************** *** 27,30 **** --- 27,31 ---- package jake2.client; + import jake2.Defines; import jake2.Globals; import jake2.game.Cmd; *************** *** 37,40 **** --- 38,42 ---- import java.awt.Dimension; + import java.nio.ByteBuffer; /** *************** *** 1234,1238 **** DrawConsole(); } else { ! // TODO impl: cl_cin.c for cinematics DrawCinematic(); } --- 1236,1240 ---- DrawConsole(); } else { ! // TODO implement cinematics completely DrawCinematic(); } *************** *** 1373,1511 **** // } cblock_t; // ! // typedef struct ! // { ! // qboolean restart_sound; ! // int s_rate; ! // int s_width; ! // int s_channels; ! // ! // int width; ! // int height; ! // byte *pic; ! // byte *pic_pending; ! // ! // // order 1 huffman stuff ! // int *hnodes1; // [256][256][2]; ! // int numhnodes1[256]; ! // ! // int h_used[512]; ! // int h_count[512]; ! // } cinematics_t; ! // ! // cinematics_t cin; ! // ! // /* ! // ================================================================= ! // ! // PCX LOADING ! // ! // ================================================================= ! // */ ! // ! // ! // /* ! // ============== ! // SCR_LoadPCX ! // ============== ! // */ ! // void SCR_LoadPCX (char *filename, byte **pic, byte **palette, int *width, ! // int *height) ! // { ! // byte *raw; ! // pcx_t *pcx; ! // int x, y; ! // int len; ! // int dataByte, runLength; ! // byte *out, *pix; ! // ! // *pic = NULL; ! // ! // // ! // // load the file ! // // ! // len = FS_LoadFile (filename, (void **)&raw); ! // if (!raw) ! // return; // Com_Printf ("Bad pcx file %s\n", filename); ! // ! // // ! // // parse the PCX file ! // // ! // pcx = (pcx_t *)raw; ! // raw = &pcx->data; ! // ! // if (pcx->manufacturer != 0x0a ! // || pcx->version != 5 ! // || pcx->encoding != 1 ! // || pcx->bits_per_pixel != 8 ! // || pcx->xmax >= 640 ! // || pcx->ymax >= 480) ! // { ! // Com_Printf ("Bad pcx file %s\n", filename); ! // return; ! // } ! // ! // out = Z_Malloc ( (pcx->ymax+1) * (pcx->xmax+1) ); ! // ! // *pic = out; ! // ! // pix = out; ! // ! // if (palette) ! // { ! // *palette = Z_Malloc(768); ! // memcpy (*palette, (byte *)pcx + len - 768, 768); ! // } ! // ! // if (width) ! // *width = pcx->xmax+1; ! // if (height) ! // *height = pcx->ymax+1; ! // ! // for (y=0 ; y<=pcx->ymax ; y++, pix += pcx->xmax+1) ! // { ! // for (x=0 ; x<=pcx->xmax ; ) ! // { ! // dataByte = *raw++; ! // ! // if((dataByte & 0xC0) == 0xC0) ! // { ! // runLength = dataByte & 0x3F; ! // dataByte = *raw++; ! // } ! // else ! // runLength = 1; ! // ! // while(runLength-- > 0) ! // pix[x++] = dataByte; ! // } ! // ! // } ! // ! // if ( raw - (byte *)pcx > len) ! // { ! // Com_Printf ("PCX file %s was malformed", filename); ! // Z_Free (*pic); ! // *pic = NULL; ! // } ! // ! // FS_FreeFile (pcx); ! // } ! // ! // ============================================================= ! /* ! * ================== SCR_StopCinematic ================== */ static void StopCinematic() { cl.cinematictime = 0; // done ! // if (cin.pic) ! // { ! // Z_Free (cin.pic); ! // cin.pic = NULL; ! // } ! // if (cin.pic_pending) ! // { ! // Z_Free (cin.pic_pending); ! // cin.pic_pending = NULL; ! // } if (cl.cinematicpalette_active) { re.CinematicSetPalette(null); --- 1375,1482 ---- // } cblock_t; // ! ! private static class cinematics_t { ! boolean restart_sound; ! int s_rate; ! int s_width; ! int s_channels; ! ! int width; ! int height; ! byte[] pic; ! byte[] pic_pending; ! // order 1 huffman stuff ! int[] hnodes1; // [256][256][2]; ! int[] numhnodes1 = new int[256]; ! ! int[] h_used = new int[512]; ! int[] h_count = new int[512]; ! } ! ! private static cinematics_t cin = new cinematics_t(); ! ! /** ! * LoadPCX ! */ ! static int LoadPCX(String filename, byte[] palette, cinematics_t cin) { ! qfiles.pcx_t pcx; ! ! // load the file ! ByteBuffer raw = FS.LoadMappedFile(filename); ! ! if (raw == null) { ! VID.Printf(Defines.PRINT_DEVELOPER, "Bad pcx file " + filename ! + '\n'); ! return 0; ! } ! ! // parse the PCX file ! pcx = new qfiles.pcx_t(raw); ! ! if (pcx.manufacturer != 0x0a || pcx.version != 5 || pcx.encoding != 1 ! || pcx.bits_per_pixel != 8 || pcx.xmax >= 640 ! || pcx.ymax >= 480) { ! ! VID.Printf(Defines.PRINT_ALL, "Bad pcx file " + filename + '\n'); ! return 0; ! } ! ! int width = pcx.xmax - pcx.xmin + 1; ! int height = pcx.ymax - pcx.ymin + 1; ! ! byte[] pix = new byte[width * height]; ! ! if (palette != null) { ! raw.position(raw.limit() - 768); ! raw.get(palette); ! } ! ! if (cin != null) { ! cin.pic = pix; ! cin.width = width; ! cin.height = height; ! } ! ! // ! // decode pcx ! // ! int count = 0; ! byte dataByte = 0; ! int runLength = 0; ! int x, y; ! ! // simple counter for buffer indexing ! int p = 0; ! ! for (y = 0; y < height; y++) { ! for (x = 0; x < width;) { ! ! dataByte = pcx.data.get(p++); ! ! if ((dataByte & 0xC0) == 0xC0) { ! runLength = dataByte & 0x3F; ! dataByte = pcx.data.get(p++); ! // write runLength pixel ! while (runLength-- > 0) { ! pix[count++] = dataByte; ! x++; ! } ! } else { ! // write one pixel ! pix[count++] = dataByte; ! x++; ! } ! } ! } ! return width * height; ! } ! ! /** ! * TODO StopCinematic */ static void StopCinematic() { cl.cinematictime = 0; // done ! cin.pic = null; ! cin.pic_pending = null; if (cl.cinematicpalette_active) { re.CinematicSetPalette(null); *************** *** 1532,1540 **** } ! /* ! * ==================== SCR_FinishCinematic * * Called when either the cinematic completes, or it is aborted - * ==================== */ static void FinishCinematic() { --- 1503,1510 ---- } ! /** ! * FinishCinematic * * Called when either the cinematic completes, or it is aborted */ static void FinishCinematic() { *************** *** 1763,1773 **** // } // ! // /* ! // ================== ! // SCR_ReadNextFrame ! // ================== ! // */ ! // byte *SCR_ReadNextFrame (void) ! // { // int r; // int command; --- 1733,1743 ---- // } // ! ! /** ! * TODO ReadNextFrame ! */ ! static byte[] ReadNextFrame() { ! // TODO implement video frame loading ! return null; // int r; // int command; *************** *** 1823,1837 **** // // return pic; ! // } // // ! /* ! * ================== SCR_RunCinematic ! * ! * ================== */ static void RunCinematic() { - int frame; - if (cl.cinematictime <= 0) { StopCinematic(); --- 1793,1803 ---- // // return pic; ! } // // ! /** ! * RunCinematic */ static void RunCinematic() { if (cl.cinematictime <= 0) { StopCinematic(); *************** *** 1839,1913 **** } ! // if (cl.cinematicframe == -1) ! // return; // static image ! // ! // if (cls.key_dest != key_game) ! // { // pause if menu or console is up ! // cl.cinematictime = cls.realtime - cl.cinematicframe*1000/14; ! // return; ! // } ! // ! // frame = (cls.realtime - cl.cinematictime)*14.0/1000; ! // if (frame <= cl.cinematicframe) ! // return; ! // if (frame > cl.cinematicframe+1) ! // { ! // Com_Printf ("Dropped frame: %i > %i\n", frame, cl.cinematicframe+1); ! // cl.cinematictime = cls.realtime - cl.cinematicframe*1000/14; ! // } ! // if (cin.pic) ! // Z_Free (cin.pic); ! // cin.pic = cin.pic_pending; ! // cin.pic_pending = NULL; ! // cin.pic_pending = SCR_ReadNextFrame (); ! // if (!cin.pic_pending) ! // { ! // SCR_StopCinematic (); ! // SCR_FinishCinematic (); ! // cl.cinematictime = 1; // hack to get the black screen behind loading ! // SCR_BeginLoadingPlaque (); ! // cl.cinematictime = 0; ! // return; ! // } } ! /* ! * ================== SCR_DrawCinematic * * Returns true if a cinematic is active, meaning the view rendering should ! * be skipped ================== */ static boolean DrawCinematic() { ! // if (cl.cinematictime <= 0) ! // { ! return false; ! // } ! // ! // if (cls.key_dest == key_menu) ! // { // blank screen and pause if menu is up ! // re.CinematicSetPalette(NULL); ! // cl.cinematicpalette_active = false; ! // return true; ! // } ! // ! // if (!cl.cinematicpalette_active) ! // { ! // re.CinematicSetPalette(cl.cinematicpalette); ! // cl.cinematicpalette_active = true; ! // } ! // ! // if (!cin.pic) ! // return true; ! // ! // re.DrawStretchRaw (0, 0, viddef.width, viddef.height, ! // cin.width, cin.height, cin.pic); ! // ! // return true; } ! /* ! * ================== SCR_PlayCinematic ! * ! * ================== */ static void PlayCinematic(String arg) { --- 1805,1872 ---- } ! if (cl.cinematicframe == -1) ! return; // static image ! ! if (cls.key_dest != key_game) ! { // pause if menu or console is up ! cl.cinematictime = cls.realtime - cl.cinematicframe*1000/14; ! return; ! } ! ! int frame = (int)((cls.realtime - cl.cinematictime) * 14.0f/1000); ! if (frame <= cl.cinematicframe) ! return; ! ! if (frame > cl.cinematicframe+1) ! { ! Com.Println("Dropped frame: " + frame + " > " + (cl.cinematicframe+1)); ! cl.cinematictime = cls.realtime - cl.cinematicframe*1000/14; ! } ! cin.pic = cin.pic_pending; ! cin.pic_pending = ReadNextFrame(); ! if (cin.pic_pending == null) ! { ! StopCinematic(); ! FinishCinematic(); ! cl.cinematictime = 1; // hack to get the black screen behind loading ! BeginLoadingPlaque(); ! cl.cinematictime = 0; ! return; ! } } ! /** ! * DrawCinematic * * Returns true if a cinematic is active, meaning the view rendering should ! * be skipped. */ static boolean DrawCinematic() { ! if (cl.cinematictime <= 0) { ! return false; ! } ! ! if (cls.key_dest == key_menu) { ! // blank screen and pause if menu is up ! Globals.re.CinematicSetPalette(null); ! cl.cinematicpalette_active = false; ! return true; ! } ! ! if (!cl.cinematicpalette_active) { ! re.CinematicSetPalette(cl.cinematicpalette); ! cl.cinematicpalette_active = true; ! } ! ! if (cin.pic == null) ! return true; ! ! Globals.re.DrawStretchRaw(0, 0, viddef.width, viddef.height, cin.width, cin.height, cin.pic); ! ! return true; } ! /** ! * TODO PlayCinematic */ static void PlayCinematic(String arg) { *************** *** 1921,1945 **** cl.cinematicframe = 0; ! // dot = strstr (arg, "."); ! // if (dot && !strcmp (dot, ".pcx")) ! // { // static pcx image ! // Com_sprintf (name, sizeof(name), "pics/%s", arg); ! // SCR_LoadPCX (name, &cin.pic, &palette, &cin.width, &cin.height); ! // cl.cinematicframe = -1; ! // cl.cinematictime = 1; ! // SCR_EndLoadingPlaque (); ! // cls.state = ca_active; ! // if (!cin.pic) ! // { ! // Com_Printf ("%s not found.\n", name); ! // cl.cinematictime = 0; ! // } ! // else ! // { ! // memcpy (cl.cinematicpalette, palette, sizeof(cl.cinematicpalette)); ! // Z_Free (palette); ! // } ! // return; ! // } // // Com_sprintf (name, sizeof(name), "video/%s", arg); --- 1880,1897 ---- cl.cinematicframe = 0; ! if (arg.endsWith(".pcx")) { ! // static pcx image ! String name = "pics/" + arg; ! int size = LoadPCX(name, cl.cinematicpalette, cin); ! cl.cinematicframe = -1; ! cl.cinematictime = 1; ! EndLoadingPlaque(); ! cls.state = ca_active; ! if (size == 0 || cin.pic == null) { ! Com.Println(name + " not found."); ! cl.cinematictime = 0; ! } ! return; ! } // // Com_sprintf (name, sizeof(name), "video/%s", arg); |
|
From: Carsten W. <ca...@us...> - 2005-02-08 18:00:54
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21322/src/jake2/qcommon Modified Files: Cvar.java Log Message: a better test for empty strings Index: Cvar.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Cvar.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Cvar.java 21 Oct 2004 03:11:30 -0000 1.6 --- Cvar.java 8 Feb 2005 18:00:02 -0000 1.7 *************** *** 359,363 **** for (var = Globals.cvar_vars; var != null; var = var.next) { ! if (var.latched_string == null || var.latched_string == "") continue; var.string = var.latched_string; --- 359,363 ---- for (var = Globals.cvar_vars; var != null; var = var.next) { ! if (var.latched_string == null || var.latched_string.length() == 0) continue; var.string = var.latched_string; |
|
From: Carsten W. <ca...@us...> - 2005-02-08 17:59:15
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20884/src/jake2/game Modified Files: SuperAdapter.java Log Message: a better test for empty strings Index: SuperAdapter.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/SuperAdapter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SuperAdapter.java 6 Feb 2005 19:15:07 -0000 1.6 --- SuperAdapter.java 8 Feb 2005 17:58:46 -0000 1.7 *************** *** 74,78 **** StackTraceElement tr[]= new Throwable().getStackTrace(); adapterid= tr[2].getClassName(); ! if (adapterid == "") new Throwable("error in creating an adapter id!").printStackTrace(); else --- 74,78 ---- StackTraceElement tr[]= new Throwable().getStackTrace(); adapterid= tr[2].getClassName(); ! if (adapterid.length() == 0) new Throwable("error in creating an adapter id!").printStackTrace(); else |
|
From: Carsten W. <ca...@us...> - 2005-02-08 17:52:33
|
Update of /cvsroot/jake2/jake2/src/jake2/render/lwjgl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18279/src/jake2/render/lwjgl Modified Files: Model.java Log Message: a better test for empty strings Index: Model.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Model.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Model.java 22 Jan 2005 22:28:15 -0000 1.6 --- Model.java 8 Feb 2005 17:52:20 -0000 1.7 *************** *** 177,181 **** { mod = mod_known[i]; ! if (mod.name == "") continue; --- 177,181 ---- { mod = mod_known[i]; ! if (mod.name.length() == 0) continue; *************** *** 235,239 **** mod = mod_known[i]; ! if (mod.name == "") continue; if (mod.name.equals(name) ) --- 235,239 ---- mod = mod_known[i]; ! if (mod.name.length() == 0) continue; if (mod.name.equals(name) ) *************** *** 248,252 **** mod = mod_known[i]; ! if (mod.name == "") break; // free spot } --- 248,252 ---- mod = mod_known[i]; ! if (mod.name.length() == 0) break; // free spot } *************** *** 1235,1239 **** { mod = mod_known[i]; ! if (mod.name == "") continue; if (mod.registration_sequence != registration_sequence) --- 1235,1239 ---- { mod = mod_known[i]; ! if (mod.name.length() == 0) continue; if (mod.registration_sequence != registration_sequence) |
|
From: Carsten W. <ca...@us...> - 2005-02-08 17:51:36
|
Update of /cvsroot/jake2/jake2/src/jake2/render/jogl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17930/src/jake2/render/jogl Modified Files: Model.java Log Message: a better test for empty strings Index: Model.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/jogl/Model.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Model.java 9 Jan 2005 22:34:21 -0000 1.5 --- Model.java 8 Feb 2005 17:51:20 -0000 1.6 *************** *** 175,179 **** { mod = mod_known[i]; ! if (mod.name == "") continue; --- 175,179 ---- { mod = mod_known[i]; ! if (mod.name.length() == 0) continue; *************** *** 233,237 **** mod = mod_known[i]; ! if (mod.name == "") continue; if (mod.name.equals(name) ) --- 233,237 ---- mod = mod_known[i]; ! if (mod.name.length() == 0) continue; if (mod.name.equals(name) ) *************** *** 246,250 **** mod = mod_known[i]; ! if (mod.name == "") break; // free spot } --- 246,250 ---- mod = mod_known[i]; ! if (mod.name.length() == 0) break; // free spot } *************** *** 1226,1230 **** { mod = mod_known[i]; ! if (mod.name == "") continue; if (mod.registration_sequence != registration_sequence) --- 1226,1230 ---- { mod = mod_known[i]; ! if (mod.name.length() == 0) continue; if (mod.registration_sequence != registration_sequence) |
|
From: Carsten W. <ca...@us...> - 2005-02-08 17:50:19
|
Update of /cvsroot/jake2/jake2/src/jake2/render/fastjogl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17434/src/jake2/render/fastjogl Modified Files: Model.java Log Message: a better test for empty strings Index: Model.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Model.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Model.java 22 Jan 2005 22:30:35 -0000 1.8 --- Model.java 8 Feb 2005 17:50:04 -0000 1.9 *************** *** 162,166 **** for (i = 0; i < mod_numknown; i++) { mod = mod_known[i]; ! if (mod.name == "") continue; --- 162,166 ---- for (i = 0; i < mod_numknown; i++) { mod = mod_known[i]; ! if (mod.name.length() == 0) continue; *************** *** 213,217 **** mod = mod_known[i]; ! if (mod.name == "") continue; if (mod.name.equals(name)) --- 213,217 ---- mod = mod_known[i]; ! if (mod.name.length() == 0) continue; if (mod.name.equals(name)) *************** *** 225,229 **** mod = mod_known[i]; ! if (mod.name == "") break; // free spot } --- 225,229 ---- mod = mod_known[i]; ! if (mod.name.length() == 0) break; // free spot } *************** *** 1141,1145 **** for (int i = 0; i < mod_numknown; i++) { mod = mod_known[i]; ! if (mod.name == "") continue; if (mod.registration_sequence != registration_sequence) { // don't --- 1141,1145 ---- for (int i = 0; i < mod_numknown; i++) { mod = mod_known[i]; ! if (mod.name.length() == 0) continue; if (mod.registration_sequence != registration_sequence) { // don't |
|
From: Carsten W. <ca...@us...> - 2005-02-07 22:38:04
|
Update of /cvsroot/jake2/jake2/src/jake2/render In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2615/src/jake2/render Modified Files: DummyRenderer.java Log Message: execute the callback Index: DummyRenderer.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/DummyRenderer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DummyRenderer.java 7 Feb 2005 17:43:23 -0000 1.1 --- DummyRenderer.java 7 Feb 2005 22:37:55 -0000 1.2 *************** *** 157,160 **** --- 157,161 ---- */ public void updateScreen(xcommand_t callback) { + callback.execute(); } |
|
From: Carsten W. <ca...@us...> - 2005-02-07 22:14:54
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30215/src/jake2/client Modified Files: CL.java Log Message: test for dedicated mode (see C-code) Index: CL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** CL.java 6 Feb 2005 19:24:31 -0000 1.18 --- CL.java 7 Feb 2005 22:14:38 -0000 1.19 *************** *** 1513,1516 **** --- 1513,1519 ---- public static void Frame(int msec) { + + if (Globals.dedicated.value != 0) + return; extratime += msec; |
|
From: Carsten W. <ca...@us...> - 2005-02-07 21:23:24
|
Update of /cvsroot/jake2/jake2/src/jake2/render In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18028/src/jake2/render Modified Files: model_t.java Log Message: cast not needed Index: model_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/model_t.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** model_t.java 22 Jan 2005 22:32:10 -0000 1.4 --- model_t.java 7 Feb 2005 21:23:14 -0000 1.5 *************** *** 194,198 **** { } ! return (model_t)theClone; } } --- 194,198 ---- { } ! return theClone; } } |
|
From: Carsten W. <ca...@us...> - 2005-02-07 17:49:37
|
Update of /cvsroot/jake2/jake2/src/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7448/src/jake2 Modified Files: Globals.java Log Message: use DummyRenderer for dedicated mode and use a valid instance for cl_timedemo Index: Globals.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/Globals.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Globals.java 18 Aug 2004 20:27:36 -0000 1.4 --- Globals.java 7 Feb 2005 17:49:26 -0000 1.5 *************** *** 30,33 **** --- 30,34 ---- import jake2.qcommon.netadr_t; import jake2.qcommon.sizebuf_t; + import jake2.render.DummyRenderer; import jake2.render.model_t; *************** *** 80,84 **** public static cvar_t cl_stereo; public static cvar_t cl_stereo_separation; ! public static cvar_t cl_timedemo; public static cvar_t cl_timeout; public static cvar_t cl_upspeed; --- 81,85 ---- public static cvar_t cl_stereo; public static cvar_t cl_stereo_separation; ! public static cvar_t cl_timedemo = new cvar_t(); public static cvar_t cl_timeout; public static cvar_t cl_upspeed; *************** *** 354,358 **** public static viddef_t viddef = new viddef_t(); // Renderer interface used by VID, SCR, ... ! public static refexport_t re = null; public static String[] keybindings = new String[256]; --- 355,359 ---- public static viddef_t viddef = new viddef_t(); // Renderer interface used by VID, SCR, ... ! public static refexport_t re = new DummyRenderer(); public static String[] keybindings = new String[256]; |
|
From: Carsten W. <ca...@us...> - 2005-02-07 17:43:34
|
Update of /cvsroot/jake2/jake2/src/jake2/render In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6257/src/jake2/render Added Files: DummyRenderer.java Log Message: is used for dedicated mode --- NEW FILE: DummyRenderer.java --- /* * DummyRenderer.java * Copyright (C) 2003 * * $Id: DummyRenderer.java,v 1.1 2005/02/07 17:43:23 cawe Exp $ */ package jake2.render; import java.awt.Dimension; import java.awt.DisplayMode; import jake2.client.refdef_t; import jake2.client.refexport_t; import jake2.qcommon.xcommand_t; import jake2.sys.KBD; /** * DummyRenderer * * @author cwei */ public class DummyRenderer implements refexport_t { /* (non-Javadoc) * @see jake2.client.refexport_t#Init(int, int) */ public boolean Init(int vid_xpos, int vid_ypos) { return false; } /* (non-Javadoc) * @see jake2.client.refexport_t#Shutdown() */ public void Shutdown() { } /* (non-Javadoc) * @see jake2.client.refexport_t#BeginRegistration(java.lang.String) */ public void BeginRegistration(String map) { } /* (non-Javadoc) * @see jake2.client.refexport_t#RegisterModel(java.lang.String) */ public model_t RegisterModel(String name) { return null; } /* (non-Javadoc) * @see jake2.client.refexport_t#RegisterSkin(java.lang.String) */ public image_t RegisterSkin(String name) { return null; } /* (non-Javadoc) * @see jake2.client.refexport_t#RegisterPic(java.lang.String) */ public image_t RegisterPic(String name) { return null; } /* (non-Javadoc) * @see jake2.client.refexport_t#SetSky(java.lang.String, float, float[]) */ public void SetSky(String name, float rotate, float[] axis) { } /* (non-Javadoc) * @see jake2.client.refexport_t#EndRegistration() */ public void EndRegistration() { } /* (non-Javadoc) * @see jake2.client.refexport_t#RenderFrame(jake2.client.refdef_t) */ public void RenderFrame(refdef_t fd) { } /* (non-Javadoc) * @see jake2.client.refexport_t#DrawGetPicSize(java.awt.Dimension, java.lang.String) */ public void DrawGetPicSize(Dimension dim, String name) { } /* (non-Javadoc) * @see jake2.client.refexport_t#DrawPic(int, int, java.lang.String) */ public void DrawPic(int x, int y, String name) { } /* (non-Javadoc) * @see jake2.client.refexport_t#DrawStretchPic(int, int, int, int, java.lang.String) */ public void DrawStretchPic(int x, int y, int w, int h, String name) { } /* (non-Javadoc) * @see jake2.client.refexport_t#DrawChar(int, int, int) */ public void DrawChar(int x, int y, int num) { } /* (non-Javadoc) * @see jake2.client.refexport_t#DrawTileClear(int, int, int, int, java.lang.String) */ public void DrawTileClear(int x, int y, int w, int h, String name) { } /* (non-Javadoc) * @see jake2.client.refexport_t#DrawFill(int, int, int, int, int) */ public void DrawFill(int x, int y, int w, int h, int c) { } /* (non-Javadoc) * @see jake2.client.refexport_t#DrawFadeScreen() */ public void DrawFadeScreen() { } /* (non-Javadoc) * @see jake2.client.refexport_t#DrawStretchRaw(int, int, int, int, int, int, byte[]) */ public void DrawStretchRaw(int x, int y, int w, int h, int cols, int rows, byte[] data) { } /* (non-Javadoc) * @see jake2.client.refexport_t#CinematicSetPalette(byte[]) */ public void CinematicSetPalette(byte[] palette) { } /* (non-Javadoc) * @see jake2.client.refexport_t#BeginFrame(float) */ public void BeginFrame(float camera_separation) { } /* (non-Javadoc) * @see jake2.client.refexport_t#EndFrame() */ public void EndFrame() { } /* (non-Javadoc) * @see jake2.client.refexport_t#AppActivate(boolean) */ public void AppActivate(boolean activate) { } /* (non-Javadoc) * @see jake2.client.refexport_t#updateScreen(jake2.qcommon.xcommand_t) */ public void updateScreen(xcommand_t callback) { } /* (non-Javadoc) * @see jake2.client.refexport_t#apiVersion() */ public int apiVersion() { return 0; } /* (non-Javadoc) * @see jake2.client.refexport_t#getModeList() */ public DisplayMode[] getModeList() { return null; } /* (non-Javadoc) * @see jake2.client.refexport_t#getKeyboardHandler() */ public KBD getKeyboardHandler() { return null; } } |
2 messages has been excluded from this view by a project administrator.
