From e2179d5c2df351428ee32b9d22231042210dda95 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sun, 11 Jun 2006 01:37:00 +0000
Subject: [PATCH] Guess what. It's not 2005 anymore.
SVN r184 (trunk)
---
src/announcer.h | 2 +-
src/autosegs.h | 2 +-
src/autostart.cpp | 2 +-
src/autozend.cpp | 2 +-
src/bbannouncer.cpp | 2 +-
src/c_bind.cpp | 2 +-
src/c_bind.h | 2 +-
src/c_cmds.cpp | 2 +-
src/c_console.cpp | 30 +-
src/c_console.h | 2 +-
src/c_cvars.cpp | 2 +-
src/c_cvars.h | 2 +-
src/c_dispatch.cpp | 24 +-
src/c_dispatch.h | 2 +-
src/c_expr.cpp | 4 +-
src/colormatcher.cpp | 2 +-
src/colormatcher.h | 2 +-
src/configfile.cpp | 2 +-
src/configfile.h | 2 +-
src/d_dehacked.cpp | 2 +-
src/d_dehacked.h | 2 +-
src/d_gui.h | 2 +-
src/d_netinf.h | 2 +-
src/d_netinfo.cpp | 2 +-
src/d_protocol.cpp | 2 +-
src/d_protocol.h | 2 +-
src/decallib.cpp | 2 +-
src/decallib.h | 2 +-
src/decorations.cpp | 2 +-
src/dobject.cpp | 2 +-
src/dobject.h | 2 +-
src/doomerrors.h | 2 +-
src/dthinker.cpp | 2 +-
src/dthinker.h | 2 +-
src/farchive.cpp | 2 +-
src/farchive.h | 2 +-
src/g_level.cpp | 2 +-
src/g_level.h | 2 +-
src/g_shared/a_camera.cpp | 2 +-
src/g_shared/a_fountain.cpp | 2 +-
src/g_shared/a_hatetarget.cpp | 2 +-
src/g_shared/a_movingcamera.cpp | 2 +-
src/g_shared/a_secrettrigger.cpp | 2 +-
src/g_shared/a_sectoraction.cpp | 2 +-
src/g_shared/a_skies.cpp | 2 +-
src/g_shared/a_soundenvironment.cpp | 2 +-
src/g_shared/a_spark.cpp | 2 +-
src/g_shared/a_waterzone.cpp | 2 +-
src/g_shared/hudmessages.cpp | 2 +-
src/g_shared/sbar.h | 2 +-
src/g_shared/shared_sbar.cpp | 36 +-
src/gameconfigfile.cpp | 2 +-
src/gameconfigfile.h | 2 +-
src/gi.cpp | 2 +-
src/gi.h | 2 +-
src/gstrings.h | 2 +-
src/hu_scores.cpp | 2 +-
src/i_cd.h | 2 +-
src/i_movie.h | 2 +-
src/info.cpp | 2 +-
src/info.h | 2 +-
src/infodefaults.cpp | 2 +-
src/infomacros.h | 2 +-
src/lists.h | 2 +-
src/lumpconfigfile.cpp | 2 +-
src/lumpconfigfile.h | 2 +-
src/m_alloc.cpp | 2 +-
src/m_alloc.h | 2 +-
src/m_argv.cpp | 2 +-
src/m_argv.h | 2 +-
src/m_crc32.h | 2 +-
src/m_options.cpp | 2 +-
src/m_png.cpp | 2 +-
src/misc.nas | 2 +-
src/mus2midi.cpp | 2 +-
src/mus2midi.h | 2 +-
src/nodebuild.cpp | 2 +-
src/nodebuild_events.cpp | 2 +-
src/nodebuild_extract.cpp | 2 +-
src/nodebuild_gl.cpp | 2 +-
src/nodebuild_utility.cpp | 2 +-
src/p_acs.cpp | 2 +-
src/p_acs.h | 2 +-
src/p_effect.cpp | 2 +-
src/p_effect.h | 2 +-
src/p_lnspec.cpp | 2 +-
src/p_lnspec.h | 2 +-
src/p_pillar.cpp | 2 +-
src/p_saveg.cpp | 2 +-
src/p_saveg.h | 2 +-
src/p_switch.cpp | 2 +-
src/p_terrain.cpp | 2 +-
src/p_terrain.h | 2 +-
src/p_things.cpp | 2 +-
src/p_trace.cpp | 2 +-
src/p_trace.h | 2 +-
src/p_xlat.cpp | 2 +-
src/r_drawt.cpp | 2 +-
src/s_advsound.cpp | 2 +-
src/s_playlist.cpp | 2 +-
src/s_playlist.h | 2 +-
src/sdl/hardware.cpp | 2 +-
src/sdl/hardware.h | 2 +-
src/sound/altsound.cpp | 2 +-
src/sound/fmodsound.cpp | 2 +-
src/sound/i_music.cpp | 2 +-
src/sound/i_music.h | 2 +-
src/sound/i_sound.cpp | 2 +-
src/sound/i_sound.h | 2 +-
src/statnums.h | 2 +-
src/stats.cpp | 2 +-
src/stats.h | 2 +-
src/stringtable.cpp | 2 +-
src/stringtable.h | 2 +-
src/tarray.h | 2 +-
src/tempfiles.cpp | 2 +-
src/tempfiles.h | 2 +-
src/templates.h | 2 +-
src/thingdef.cpp | 4 +-
src/thingdef_codeptr.cpp | 4 +-
src/tmap.nas | 2 +-
src/tmap2.nas | 2 +-
src/v_collection.cpp | 2 +-
src/v_collection.h | 2 +-
src/v_draw.cpp | 2 +-
src/v_font.cpp | 2 +-
src/v_font.h | 2 +-
src/v_palette.cpp | 2 +-
src/v_palette.h | 2 +-
src/v_pfx.cpp | 2 +-
src/v_pfx.h | 2 +-
src/v_text.cpp | 2 +-
src/v_text.h | 2 +-
src/v_video.h | 2 +-
src/version.h | 2 +-
src/weightedlist.h | 2 +-
src/win32/hardware.cpp | 412 +++++++++++-----------
src/win32/hardware.h | 122 +++----
src/win32/helperthread.cpp | 508 ++++++++++++++--------------
src/win32/helperthread.h | 106 +++---
src/win32/i_cd.cpp | 2 +-
src/win32/i_crash.cpp | 2 +-
src/win32/i_input.cpp | 2 +-
src/win32/i_input.h | 2 +-
src/win32/i_movie.cpp | 2 +-
src/win32/win32iface.h | 106 +++---
src/win32/win32video.cpp | 2 +-
src/win32/zdoom.rc | 252 +++++---------
148 files changed, 903 insertions(+), 977 deletions(-)
diff --git a/src/announcer.h b/src/announcer.h
index af6bafdf3..bb6be49ee 100644
--- a/src/announcer.h
+++ b/src/announcer.h
@@ -2,7 +2,7 @@
** announcer.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/autosegs.h b/src/autosegs.h
index 402bcf054..7828421f0 100644
--- a/src/autosegs.h
+++ b/src/autosegs.h
@@ -3,7 +3,7 @@
** Arrays built at link-time
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/autostart.cpp b/src/autostart.cpp
index 2c219fee4..b2ca2a5ba 100644
--- a/src/autostart.cpp
+++ b/src/autostart.cpp
@@ -3,7 +3,7 @@
** This file contains the heads of lists stored in special data segments
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/autozend.cpp b/src/autozend.cpp
index 6459df896..3485ef890 100644
--- a/src/autozend.cpp
+++ b/src/autozend.cpp
@@ -3,7 +3,7 @@
** This file contains the tails of lists stored in special data segments
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/bbannouncer.cpp b/src/bbannouncer.cpp
index af9c5955c..eb4b07572 100644
--- a/src/bbannouncer.cpp
+++ b/src/bbannouncer.cpp
@@ -3,7 +3,7 @@
** The announcer from Blood (The Voice).
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/c_bind.cpp b/src/c_bind.cpp
index 8f4bb0543..1cc38145a 100644
--- a/src/c_bind.cpp
+++ b/src/c_bind.cpp
@@ -3,7 +3,7 @@
** Functions for using and maintaining key bindings
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/c_bind.h b/src/c_bind.h
index 98df0ef74..e0e738439 100644
--- a/src/c_bind.h
+++ b/src/c_bind.h
@@ -2,7 +2,7 @@
** c_bind.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/c_cmds.cpp b/src/c_cmds.cpp
index db77990b5..fa2714972 100644
--- a/src/c_cmds.cpp
+++ b/src/c_cmds.cpp
@@ -3,7 +3,7 @@
** Miscellaneous console commands.
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/c_console.cpp b/src/c_console.cpp
index f3f52d561..3431264c1 100644
--- a/src/c_console.cpp
+++ b/src/c_console.cpp
@@ -3,7 +3,7 @@
** Implements the console itself
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
@@ -482,20 +482,20 @@ void C_DeinitConsole ()
HistTail = HistHead = HistPos = NULL;
// Free cvars allocated at runtime
- FBaseCVar *var, *next, **nextp;
- for (var = CVars, nextp = &CVars; var != NULL; var = next)
- {
- next = var->m_Next;
- if (var->GetFlags() & CVAR_UNSETTABLE)
- {
- delete var;
- *nextp = next;
- }
- else
- {
- nextp = &var->m_Next;
- }
- }
+ FBaseCVar *var, *next, **nextp;
+ for (var = CVars, nextp = &CVars; var != NULL; var = next)
+ {
+ next = var->m_Next;
+ if (var->GetFlags() & CVAR_UNSETTABLE)
+ {
+ delete var;
+ *nextp = next;
+ }
+ else
+ {
+ nextp = &var->m_Next;
+ }
+ }
// Free alias commands. (i.e. The "commands" that can be allocated
// at runtime.)
diff --git a/src/c_console.h b/src/c_console.h
index e6dc873ad..d2b8ec545 100644
--- a/src/c_console.h
+++ b/src/c_console.h
@@ -2,7 +2,7 @@
** c_console.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/c_cvars.cpp b/src/c_cvars.cpp
index 6fe593a5f..5cba59bf4 100644
--- a/src/c_cvars.cpp
+++ b/src/c_cvars.cpp
@@ -3,7 +3,7 @@
** Defines all the different console variable types
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/c_cvars.h b/src/c_cvars.h
index aa82588d0..55b1ed4ca 100644
--- a/src/c_cvars.h
+++ b/src/c_cvars.h
@@ -2,7 +2,7 @@
** c_cvars.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/c_dispatch.cpp b/src/c_dispatch.cpp
index 9cd341a98..54de5e275 100644
--- a/src/c_dispatch.cpp
+++ b/src/c_dispatch.cpp
@@ -3,7 +3,7 @@
** Functions for executing console commands and aliases
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
@@ -53,17 +53,17 @@
bool ParsingKeyConf;
-static const char *KeyConfCommands[] =
-{
- "alias",
- "defaultbind",
- "addkeysection",
- "addmenukey",
- "addslotdefault",
- "weaponsection",
- "setslot"
-};
-
+static const char *KeyConfCommands[] =
+{
+ "alias",
+ "defaultbind",
+ "addkeysection",
+ "addmenukey",
+ "addslotdefault",
+ "weaponsection",
+ "setslot"
+};
+
static long ParseCommandLine (const char *args, int *argc, char **argv);
CVAR (Bool, lookspring, true, CVAR_ARCHIVE); // Generate centerview when -mlook encountered?
diff --git a/src/c_dispatch.h b/src/c_dispatch.h
index e8cb79e22..1af32ad48 100644
--- a/src/c_dispatch.h
+++ b/src/c_dispatch.h
@@ -2,7 +2,7 @@
** c_dispatch.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/c_expr.cpp b/src/c_expr.cpp
index 337b4fced..64f14f10c 100644
--- a/src/c_expr.cpp
+++ b/src/c_expr.cpp
@@ -3,7 +3,7 @@
** Console commands dealing with mathematical expressions
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@
// HEADER FILES ------------------------------------------------------------
-#include <stdlib.h>
+#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/src/colormatcher.cpp b/src/colormatcher.cpp
index b490656a1..b8cc632bf 100644
--- a/src/colormatcher.cpp
+++ b/src/colormatcher.cpp
@@ -3,7 +3,7 @@
** My attempt at a fast color matching system
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/colormatcher.h b/src/colormatcher.h
index d6d5c5f79..633b7f4ce 100644
--- a/src/colormatcher.h
+++ b/src/colormatcher.h
@@ -2,7 +2,7 @@
** colormatcher.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/configfile.cpp b/src/configfile.cpp
index aac482c42..08aca2911 100644
--- a/src/configfile.cpp
+++ b/src/configfile.cpp
@@ -3,7 +3,7 @@
** Implements the basic .ini parsing class
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/configfile.h b/src/configfile.h
index c06a0ba0f..1eec7b3f5 100644
--- a/src/configfile.h
+++ b/src/configfile.h
@@ -2,7 +2,7 @@
** configfile.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp
index 290a92435..723a5a813 100644
--- a/src/d_dehacked.cpp
+++ b/src/d_dehacked.cpp
@@ -3,7 +3,7 @@
** Parses dehacked/bex patches and changes game structures accordingly
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/d_dehacked.h b/src/d_dehacked.h
index af83ba87d..df5c04b9a 100644
--- a/src/d_dehacked.h
+++ b/src/d_dehacked.h
@@ -2,7 +2,7 @@
** d_dehacked.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/d_gui.h b/src/d_gui.h
index 2857309a3..30bd21cb6 100644
--- a/src/d_gui.h
+++ b/src/d_gui.h
@@ -2,7 +2,7 @@
** d_gui.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/d_netinf.h b/src/d_netinf.h
index 93ace7149..a8b3709ec 100644
--- a/src/d_netinf.h
+++ b/src/d_netinf.h
@@ -2,7 +2,7 @@
** d_netinf.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp
index e06b822a0..1c5092166 100644
--- a/src/d_netinfo.cpp
+++ b/src/d_netinfo.cpp
@@ -3,7 +3,7 @@
** Manages transport of user and "server" cvars across a network
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/d_protocol.cpp b/src/d_protocol.cpp
index db9580a21..cff2da224 100644
--- a/src/d_protocol.cpp
+++ b/src/d_protocol.cpp
@@ -3,7 +3,7 @@
** Basic network packet creation routines and simple IFF parsing
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/d_protocol.h b/src/d_protocol.h
index ecd475487..2a4c9a3b8 100644
--- a/src/d_protocol.h
+++ b/src/d_protocol.h
@@ -2,7 +2,7 @@
** d_protocol.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/decallib.cpp b/src/decallib.cpp
index 56a4da347..62f5970db 100644
--- a/src/decallib.cpp
+++ b/src/decallib.cpp
@@ -3,7 +3,7 @@
** Parses DECALDEFs and creates a "library" of decals
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/decallib.h b/src/decallib.h
index 9428ea11b..6406103db 100644
--- a/src/decallib.h
+++ b/src/decallib.h
@@ -2,7 +2,7 @@
** decallib.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/decorations.cpp b/src/decorations.cpp
index 5bc5abc90..92ff95050 100644
--- a/src/decorations.cpp
+++ b/src/decorations.cpp
@@ -3,7 +3,7 @@
** Loads custom actors out of DECORATE lumps.
**
**---------------------------------------------------------------------------
-** Copyright 2002-2005 Randy Heit
+** Copyright 2002-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/dobject.cpp b/src/dobject.cpp
index 04a37b361..cf404e6ff 100644
--- a/src/dobject.cpp
+++ b/src/dobject.cpp
@@ -3,7 +3,7 @@
** Implements the base class DObject, which most other classes derive from
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/dobject.h b/src/dobject.h
index 3f7c66900..be1fefbfc 100644
--- a/src/dobject.h
+++ b/src/dobject.h
@@ -2,7 +2,7 @@
** dobject.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/doomerrors.h b/src/doomerrors.h
index 7c4f5f8fc..dc77250aa 100644
--- a/src/doomerrors.h
+++ b/src/doomerrors.h
@@ -3,7 +3,7 @@
** Contains error classes that can be thrown around
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/dthinker.cpp b/src/dthinker.cpp
index c85d2e163..374aeb0fb 100644
--- a/src/dthinker.cpp
+++ b/src/dthinker.cpp
@@ -3,7 +3,7 @@
** Implements the base class for almost anything in a level that might think
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/dthinker.h b/src/dthinker.h
index b178f3025..71dad43ef 100644
--- a/src/dthinker.h
+++ b/src/dthinker.h
@@ -2,7 +2,7 @@
** dthinker.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/farchive.cpp b/src/farchive.cpp
index dd4b2b12d..1ae58ca9a 100644
--- a/src/farchive.cpp
+++ b/src/farchive.cpp
@@ -3,7 +3,7 @@
** Implements an archiver for DObject serialization.
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/farchive.h b/src/farchive.h
index 155e2f68d..1960c619a 100644
--- a/src/farchive.h
+++ b/src/farchive.h
@@ -2,7 +2,7 @@
** farchive.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_level.cpp b/src/g_level.cpp
index cf1c0d5ec..12c9d63a9 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -3,7 +3,7 @@
** Parses MAPINFO and controls movement between levels
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_level.h b/src/g_level.h
index f9e49a9cc..2b76e2f60 100644
--- a/src/g_level.h
+++ b/src/g_level.h
@@ -2,7 +2,7 @@
** g_level.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/a_camera.cpp b/src/g_shared/a_camera.cpp
index e7863072e..d2bfeca23 100644
--- a/src/g_shared/a_camera.cpp
+++ b/src/g_shared/a_camera.cpp
@@ -3,7 +3,7 @@
** Implements the Duke Nukem 3D-ish security camera
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/a_fountain.cpp b/src/g_shared/a_fountain.cpp
index 939204485..fcfebff76 100644
--- a/src/g_shared/a_fountain.cpp
+++ b/src/g_shared/a_fountain.cpp
@@ -3,7 +3,7 @@
** Actors that make particle fountains
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/a_hatetarget.cpp b/src/g_shared/a_hatetarget.cpp
index 2c120ca66..b4eac96d4 100644
--- a/src/g_shared/a_hatetarget.cpp
+++ b/src/g_shared/a_hatetarget.cpp
@@ -3,7 +3,7 @@
** Something for monsters to hate and shoot at
**
**---------------------------------------------------------------------------
-** Copyright 2003-2005 Randy Heit
+** Copyright 2003-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/a_movingcamera.cpp b/src/g_shared/a_movingcamera.cpp
index a0a268620..775260b9f 100644
--- a/src/g_shared/a_movingcamera.cpp
+++ b/src/g_shared/a_movingcamera.cpp
@@ -3,7 +3,7 @@
** Cameras that move and related neat stuff
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/a_secrettrigger.cpp b/src/g_shared/a_secrettrigger.cpp
index a7e40208e..961c69b5c 100644
--- a/src/g_shared/a_secrettrigger.cpp
+++ b/src/g_shared/a_secrettrigger.cpp
@@ -3,7 +3,7 @@
** A thing that counts toward the secret count when activated
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/a_sectoraction.cpp b/src/g_shared/a_sectoraction.cpp
index 0378772af..bddc0f15b 100644
--- a/src/g_shared/a_sectoraction.cpp
+++ b/src/g_shared/a_sectoraction.cpp
@@ -3,7 +3,7 @@
** Actors that hold specials to be executed upon conditions in a sector
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/a_skies.cpp b/src/g_shared/a_skies.cpp
index a754fde90..e9fe8d949 100644
--- a/src/g_shared/a_skies.cpp
+++ b/src/g_shared/a_skies.cpp
@@ -3,7 +3,7 @@
** Skybox-related actors
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/a_soundenvironment.cpp b/src/g_shared/a_soundenvironment.cpp
index 2273ec2c1..77fdef331 100644
--- a/src/g_shared/a_soundenvironment.cpp
+++ b/src/g_shared/a_soundenvironment.cpp
@@ -3,7 +3,7 @@
** Actor that controls the EAX settings in its zone
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/a_spark.cpp b/src/g_shared/a_spark.cpp
index 885cb7846..bbfa92903 100644
--- a/src/g_shared/a_spark.cpp
+++ b/src/g_shared/a_spark.cpp
@@ -3,7 +3,7 @@
** Actor that makes a particle spark when activated
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/a_waterzone.cpp b/src/g_shared/a_waterzone.cpp
index 9e234f76b..138242ef2 100644
--- a/src/g_shared/a_waterzone.cpp
+++ b/src/g_shared/a_waterzone.cpp
@@ -3,7 +3,7 @@
** Actor that makes BOOM deep water swimmable
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/hudmessages.cpp b/src/g_shared/hudmessages.cpp
index 05d71fd2c..6cd8cf630 100644
--- a/src/g_shared/hudmessages.cpp
+++ b/src/g_shared/hudmessages.cpp
@@ -3,7 +3,7 @@
** Neato messages for the HUD
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/sbar.h b/src/g_shared/sbar.h
index aae2c44b6..5cec9ce6b 100644
--- a/src/g_shared/sbar.h
+++ b/src/g_shared/sbar.h
@@ -3,7 +3,7 @@
** Base status bar definition
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/g_shared/shared_sbar.cpp b/src/g_shared/shared_sbar.cpp
index 930f0b03b..91d24bcb4 100644
--- a/src/g_shared/shared_sbar.cpp
+++ b/src/g_shared/shared_sbar.cpp
@@ -3,7 +3,7 @@
** Base status bar implementation
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
@@ -1571,23 +1571,23 @@ AInventory *FBaseStatusBar::ValidateInvFirst (int numVisible) const
void FBaseStatusBar::GetCurrentAmmo (AAmmo *&ammo1, AAmmo *&ammo2, int &ammocount1, int &ammocount2) const
{
- if (CPlayer->ReadyWeapon != NULL)
- {
- ammo1 = CPlayer->ReadyWeapon->Ammo1;
- ammo2 = CPlayer->ReadyWeapon->Ammo2;
- if (ammo1 == NULL)
- {
- ammo1 = ammo2;
- ammo2 = NULL;
- }
- }
- else
- {
- ammo1 = ammo2 = NULL;
- }
- ammocount1 = ammo1 != NULL ? ammo1->Amount : 0;
- ammocount2 = ammo2 != NULL ? ammo2->Amount : 0;
-}
+ if (CPlayer->ReadyWeapon != NULL)
+ {
+ ammo1 = CPlayer->ReadyWeapon->Ammo1;
+ ammo2 = CPlayer->ReadyWeapon->Ammo2;
+ if (ammo1 == NULL)
+ {
+ ammo1 = ammo2;
+ ammo2 = NULL;
+ }
+ }
+ else
+ {
+ ammo1 = ammo2 = NULL;
+ }
+ ammocount1 = ammo1 != NULL ? ammo1->Amount : 0;
+ ammocount2 = ammo2 != NULL ? ammo2->Amount : 0;
+}
//============================================================================
//
diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
index 3aa808611..5f19dfd6a 100644
--- a/src/gameconfigfile.cpp
+++ b/src/gameconfigfile.cpp
@@ -3,7 +3,7 @@
** An .ini parser specifically for zdoom.ini
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/gameconfigfile.h b/src/gameconfigfile.h
index 06548c54d..3492bf6cd 100644
--- a/src/gameconfigfile.h
+++ b/src/gameconfigfile.h
@@ -2,7 +2,7 @@
** gameconfigfile.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/gi.cpp b/src/gi.cpp
index 2c8143817..9962effda 100644
--- a/src/gi.cpp
+++ b/src/gi.cpp
@@ -3,7 +3,7 @@
** Holds same game-dependant info
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/gi.h b/src/gi.h
index 355a093b1..62e4cb7d9 100644
--- a/src/gi.h
+++ b/src/gi.h
@@ -2,7 +2,7 @@
** gi.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/gstrings.h b/src/gstrings.h
index 97680ed49..99366bcf3 100644
--- a/src/gstrings.h
+++ b/src/gstrings.h
@@ -2,7 +2,7 @@
** gstrings.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/hu_scores.cpp b/src/hu_scores.cpp
index dd34bfd23..ed106a526 100644
--- a/src/hu_scores.cpp
+++ b/src/hu_scores.cpp
@@ -3,7 +3,7 @@
** Routines for drawing the deathmatch scoreboard.
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/i_cd.h b/src/i_cd.h
index 3e9f8c18d..41c6da4a3 100644
--- a/src/i_cd.h
+++ b/src/i_cd.h
@@ -3,7 +3,7 @@
** Defines the CD interface
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/i_movie.h b/src/i_movie.h
index d886e7a0e..4104ee5ca 100644
--- a/src/i_movie.h
+++ b/src/i_movie.h
@@ -3,7 +3,7 @@
** Defines the movie-related stuff
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/info.cpp b/src/info.cpp
index 3523e1eee..9a671a388 100644
--- a/src/info.cpp
+++ b/src/info.cpp
@@ -3,7 +3,7 @@
** Keeps track of available actors and their states
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/info.h b/src/info.h
index aa5470e19..86cc5c935 100644
--- a/src/info.h
+++ b/src/info.h
@@ -2,7 +2,7 @@
** info.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/infodefaults.cpp b/src/infodefaults.cpp
index 6eacece45..9e6da0006 100644
--- a/src/infodefaults.cpp
+++ b/src/infodefaults.cpp
@@ -3,7 +3,7 @@
** Parses default lists to create default copies of actors
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/infomacros.h b/src/infomacros.h
index d99ab0bf4..9f8095e03 100644
--- a/src/infomacros.h
+++ b/src/infomacros.h
@@ -2,7 +2,7 @@
** infomacros.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/lists.h b/src/lists.h
index 63c1ccf08..e058d2767 100644
--- a/src/lists.h
+++ b/src/lists.h
@@ -3,7 +3,7 @@
** Essentially, Amiga Exec lists and nodes
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/lumpconfigfile.cpp b/src/lumpconfigfile.cpp
index 821531c67..7df80895a 100644
--- a/src/lumpconfigfile.cpp
+++ b/src/lumpconfigfile.cpp
@@ -3,7 +3,7 @@
** Reads an .ini file in a lump
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/lumpconfigfile.h b/src/lumpconfigfile.h
index 0b41f096f..dcf7426db 100644
--- a/src/lumpconfigfile.h
+++ b/src/lumpconfigfile.h
@@ -2,7 +2,7 @@
** lumpconfigfile.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/m_alloc.cpp b/src/m_alloc.cpp
index 4ba38d8a7..f448c9d91 100644
--- a/src/m_alloc.cpp
+++ b/src/m_alloc.cpp
@@ -3,7 +3,7 @@
** Wrappers for the malloc family of functions
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/m_alloc.h b/src/m_alloc.h
index ae8853cd8..2b18c7c3a 100644
--- a/src/m_alloc.h
+++ b/src/m_alloc.h
@@ -2,7 +2,7 @@
** m_alloc.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/m_argv.cpp b/src/m_argv.cpp
index ec26adb74..155374c60 100644
--- a/src/m_argv.cpp
+++ b/src/m_argv.cpp
@@ -3,7 +3,7 @@
** Manages command line arguments
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/m_argv.h b/src/m_argv.h
index cd1874101..65973de9e 100644
--- a/src/m_argv.h
+++ b/src/m_argv.h
@@ -2,7 +2,7 @@
** m_argv.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/m_crc32.h b/src/m_crc32.h
index 815163b74..d8a42c0ed 100644
--- a/src/m_crc32.h
+++ b/src/m_crc32.h
@@ -3,7 +3,7 @@
** Simple interface to zlib's CRC table
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/m_options.cpp b/src/m_options.cpp
index dc27e17ae..f91d0c951 100644
--- a/src/m_options.cpp
+++ b/src/m_options.cpp
@@ -3,7 +3,7 @@
** New options menu code
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/m_png.cpp b/src/m_png.cpp
index 002673a20..b3eaf48a2 100644
--- a/src/m_png.cpp
+++ b/src/m_png.cpp
@@ -3,7 +3,7 @@
** Routines for manipulating PNG files.
**
**---------------------------------------------------------------------------
-** Copyright 2002-2005 Randy Heit
+** Copyright 2002-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/misc.nas b/src/misc.nas
index f49bbd2da..7d8557d46 100644
--- a/src/misc.nas
+++ b/src/misc.nas
@@ -3,7 +3,7 @@
;* Miscellaneous assembly functions
;*
;*---------------------------------------------------------------------------
-;* Copyright 1998-2005 Randy Heit
+;* Copyright 1998-2006 Randy Heit
;* All rights reserved.
;*
;* Redistribution and use in source and binary forms, with or without
diff --git a/src/mus2midi.cpp b/src/mus2midi.cpp
index 8c4326586..db2c5e73e 100644
--- a/src/mus2midi.cpp
+++ b/src/mus2midi.cpp
@@ -3,7 +3,7 @@
** Simple converter from MUS to MIDI format
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/mus2midi.h b/src/mus2midi.h
index f8a819ec2..61e32070c 100644
--- a/src/mus2midi.h
+++ b/src/mus2midi.h
@@ -2,7 +2,7 @@
** mus2midi.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/nodebuild.cpp b/src/nodebuild.cpp
index f149963e2..b211b5478 100644
--- a/src/nodebuild.cpp
+++ b/src/nodebuild.cpp
@@ -4,7 +4,7 @@
** The main logic for the internal node builder.
**
**---------------------------------------------------------------------------
-** Copyright 2002-2005 Randy Heit
+** Copyright 2002-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/nodebuild_events.cpp b/src/nodebuild_events.cpp
index 550910473..d7660f588 100644
--- a/src/nodebuild_events.cpp
+++ b/src/nodebuild_events.cpp
@@ -4,7 +4,7 @@
** A red-black tree for keeping track of segs that get touched by a splitter.
**
**---------------------------------------------------------------------------
-** Copyright 2002-2005 Randy Heit
+** Copyright 2002-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/nodebuild_extract.cpp b/src/nodebuild_extract.cpp
index 04d1bfe3f..df15b6593 100644
--- a/src/nodebuild_extract.cpp
+++ b/src/nodebuild_extract.cpp
@@ -5,7 +5,7 @@
** internal format to the format used by the rest of the game.
**
**---------------------------------------------------------------------------
-** Copyright 2002-2005 Randy Heit
+** Copyright 2002-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/nodebuild_gl.cpp b/src/nodebuild_gl.cpp
index 0a9b527f1..b40a05b70 100644
--- a/src/nodebuild_gl.cpp
+++ b/src/nodebuild_gl.cpp
@@ -4,7 +4,7 @@
** Extra functions for the node builder to create minisegs.
**
**---------------------------------------------------------------------------
-** Copyright 2002-2005 Randy Heit
+** Copyright 2002-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/nodebuild_utility.cpp b/src/nodebuild_utility.cpp
index c49117b37..9dd8a1f73 100644
--- a/src/nodebuild_utility.cpp
+++ b/src/nodebuild_utility.cpp
@@ -4,7 +4,7 @@
** Miscellaneous node builder utility functions.
**
**---------------------------------------------------------------------------
-** Copyright 2002-2005 Randy Heit
+** Copyright 2002-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index e03ee4d8e..055ceda06 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -3,7 +3,7 @@
** General BEHAVIOR management and ACS execution environment
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_acs.h b/src/p_acs.h
index be61b79b8..e14bd02ed 100644
--- a/src/p_acs.h
+++ b/src/p_acs.h
@@ -3,7 +3,7 @@
** ACS script stuff
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_effect.cpp b/src/p_effect.cpp
index 3e8dcbaec..03ad7e834 100644
--- a/src/p_effect.cpp
+++ b/src/p_effect.cpp
@@ -3,7 +3,7 @@
** Particle effects
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_effect.h b/src/p_effect.h
index 463b051c6..57afdc810 100644
--- a/src/p_effect.h
+++ b/src/p_effect.h
@@ -2,7 +2,7 @@
** p_effect.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp
index a9ce4ecfb..5137a0e69 100644
--- a/src/p_lnspec.cpp
+++ b/src/p_lnspec.cpp
@@ -3,7 +3,7 @@
** Handles line specials
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_lnspec.h b/src/p_lnspec.h
index ed3a7b17c..656dcc79b 100644
--- a/src/p_lnspec.h
+++ b/src/p_lnspec.h
@@ -3,7 +3,7 @@
** New line and sector specials (Using Hexen as a base.)
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_pillar.cpp b/src/p_pillar.cpp
index 840a65fd4..47182c956 100644
--- a/src/p_pillar.cpp
+++ b/src/p_pillar.cpp
@@ -3,7 +3,7 @@
** Handles pillars
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp
index 6c1c2fdb6..3e3ce1a2b 100644
--- a/src/p_saveg.cpp
+++ b/src/p_saveg.cpp
@@ -3,7 +3,7 @@
** Code for serializing the world state in an archive
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_saveg.h b/src/p_saveg.h
index 08a1125f9..edb73e67e 100644
--- a/src/p_saveg.h
+++ b/src/p_saveg.h
@@ -2,7 +2,7 @@
** p_saveg.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_switch.cpp b/src/p_switch.cpp
index b83d9cdc6..d5a82c905 100644
--- a/src/p_switch.cpp
+++ b/src/p_switch.cpp
@@ -3,7 +3,7 @@
** Switch and button maintenance and animation
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_terrain.cpp b/src/p_terrain.cpp
index 0c49d026b..85c9fdaf8 100644
--- a/src/p_terrain.cpp
+++ b/src/p_terrain.cpp
@@ -3,7 +3,7 @@
** Terrain maintenance
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_terrain.h b/src/p_terrain.h
index 5654a51a8..5c85021ad 100644
--- a/src/p_terrain.h
+++ b/src/p_terrain.h
@@ -2,7 +2,7 @@
** p_terrain.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_things.cpp b/src/p_things.cpp
index 5b84ffac9..a49fc5530 100644
--- a/src/p_things.cpp
+++ b/src/p_things.cpp
@@ -3,7 +3,7 @@
** ACS-accessible thing utilities
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_trace.cpp b/src/p_trace.cpp
index 97999107a..7fd71da70 100644
--- a/src/p_trace.cpp
+++ b/src/p_trace.cpp
@@ -3,7 +3,7 @@
** Generalized trace function, like most 3D games have
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_trace.h b/src/p_trace.h
index 20a52be79..d2fa16603 100644
--- a/src/p_trace.h
+++ b/src/p_trace.h
@@ -2,7 +2,7 @@
** p_trace.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/p_xlat.cpp b/src/p_xlat.cpp
index f3a578afb..b61b51927 100644
--- a/src/p_xlat.cpp
+++ b/src/p_xlat.cpp
@@ -3,7 +3,7 @@
** Translate old Doom format maps to the Hexen format
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/r_drawt.cpp b/src/r_drawt.cpp
index 30a0ddf78..611f9d7b6 100644
--- a/src/r_drawt.cpp
+++ b/src/r_drawt.cpp
@@ -3,7 +3,7 @@
** Faster column drawers for modern processors
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/s_advsound.cpp b/src/s_advsound.cpp
index 460f68ad0..ff88ecfd9 100644
--- a/src/s_advsound.cpp
+++ b/src/s_advsound.cpp
@@ -3,7 +3,7 @@
** Routines for managing SNDINFO lumps and ambient sounds
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/s_playlist.cpp b/src/s_playlist.cpp
index eda4cc2d8..16a5f1753 100644
--- a/src/s_playlist.cpp
+++ b/src/s_playlist.cpp
@@ -3,7 +3,7 @@
** Implementation of the FPlayList class. Handles m3u playlist parsing
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/s_playlist.h b/src/s_playlist.h
index 2ea662340..6f1568d4d 100644
--- a/src/s_playlist.h
+++ b/src/s_playlist.h
@@ -2,7 +2,7 @@
** s_playlist.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/sdl/hardware.cpp b/src/sdl/hardware.cpp
index e7eed35ea..6c4ee03ee 100644
--- a/src/sdl/hardware.cpp
+++ b/src/sdl/hardware.cpp
@@ -3,7 +3,7 @@
** Somewhat OS-independant interface to the screen, mouse, keyboard, and stick
**
**---------------------------------------------------------------------------
-** Copyright 1998-2001 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/sdl/hardware.h b/src/sdl/hardware.h
index f07e41618..e7477bcd1 100644
--- a/src/sdl/hardware.h
+++ b/src/sdl/hardware.h
@@ -2,7 +2,7 @@
** hardware.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2001 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/sound/altsound.cpp b/src/sound/altsound.cpp
index a80fcf996..c4fe16b28 100644
--- a/src/sound/altsound.cpp
+++ b/src/sound/altsound.cpp
@@ -4,7 +4,7 @@
** Simple, no frills DirectSound player.
**
**---------------------------------------------------------------------------
-** Copyright 2002-2005 Randy Heit
+** Copyright 2002-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/sound/fmodsound.cpp b/src/sound/fmodsound.cpp
index 01dc50ef7..ac47ed290 100644
--- a/src/sound/fmodsound.cpp
+++ b/src/sound/fmodsound.cpp
@@ -3,7 +3,7 @@
** System interface for sound; uses fmod.dll
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/sound/i_music.cpp b/src/sound/i_music.cpp
index de4c35391..4e498aba6 100644
--- a/src/sound/i_music.cpp
+++ b/src/sound/i_music.cpp
@@ -3,7 +3,7 @@
** Plays music
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/sound/i_music.h b/src/sound/i_music.h
index 04dbb64bb..0a5587aaf 100644
--- a/src/sound/i_music.h
+++ b/src/sound/i_music.h
@@ -2,7 +2,7 @@
** i_music.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/sound/i_sound.cpp b/src/sound/i_sound.cpp
index 036a295ea..ac1550a5b 100644
--- a/src/sound/i_sound.cpp
+++ b/src/sound/i_sound.cpp
@@ -3,7 +3,7 @@
** System interface for sound; uses fmod.dll
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/sound/i_sound.h b/src/sound/i_sound.h
index 2089ffde8..eecb31f0c 100644
--- a/src/sound/i_sound.h
+++ b/src/sound/i_sound.h
@@ -2,7 +2,7 @@
** i_sound.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/statnums.h b/src/statnums.h
index 4e286fa5d..0fa2ad53c 100644
--- a/src/statnums.h
+++ b/src/statnums.h
@@ -2,7 +2,7 @@
** statnums.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/stats.cpp b/src/stats.cpp
index 4b6d970b9..b99341407 100644
--- a/src/stats.cpp
+++ b/src/stats.cpp
@@ -3,7 +3,7 @@
** Performance-monitoring statistics
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/stats.h b/src/stats.h
index 2d7607535..4ca3463b7 100644
--- a/src/stats.h
+++ b/src/stats.h
@@ -2,7 +2,7 @@
** stats.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/stringtable.cpp b/src/stringtable.cpp
index f5b774e12..5a305c9e1 100644
--- a/src/stringtable.cpp
+++ b/src/stringtable.cpp
@@ -3,7 +3,7 @@
** Implements the FStringTable class
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/stringtable.h b/src/stringtable.h
index ad08f7164..5d4eac6b8 100644
--- a/src/stringtable.h
+++ b/src/stringtable.h
@@ -2,7 +2,7 @@
** stringtable.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/tarray.h b/src/tarray.h
index 9c2d8ac91..0cd10a203 100644
--- a/src/tarray.h
+++ b/src/tarray.h
@@ -3,7 +3,7 @@
** Templated, automatically resizing array
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/tempfiles.cpp b/src/tempfiles.cpp
index af6b345a5..e3c35623f 100644
--- a/src/tempfiles.cpp
+++ b/src/tempfiles.cpp
@@ -3,7 +3,7 @@
** Temporary name generator. Deletes the temporary file when deconstructed.
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/tempfiles.h b/src/tempfiles.h
index 93fd61c7d..799014c16 100644
--- a/src/tempfiles.h
+++ b/src/tempfiles.h
@@ -2,7 +2,7 @@
** tempfiles.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/templates.h b/src/templates.h
index c24f0b0b6..46bb83fb9 100644
--- a/src/templates.h
+++ b/src/templates.h
@@ -3,7 +3,7 @@
** Some useful template functions
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/thingdef.cpp b/src/thingdef.cpp
index 6e98959ed..33f848ca6 100644
--- a/src/thingdef.cpp
+++ b/src/thingdef.cpp
@@ -4,8 +4,8 @@
** Actor definitions
**
**---------------------------------------------------------------------------
-** Copyright 2002-2005 Christoph Oelckers
-** Copyright 2004-2005 Randy Heit
+** Copyright 2002-2006 Christoph Oelckers
+** Copyright 2004-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/thingdef_codeptr.cpp b/src/thingdef_codeptr.cpp
index e1832f896..3c4bb1f97 100644
--- a/src/thingdef_codeptr.cpp
+++ b/src/thingdef_codeptr.cpp
@@ -4,8 +4,8 @@
** Code pointers for Actor definitions
**
**---------------------------------------------------------------------------
-** Copyright 2002-2005 Christoph Oelckers
-** Copyright 2004-2005 Randy Heit
+** Copyright 2002-2006 Christoph Oelckers
+** Copyright 2004-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/tmap.nas b/src/tmap.nas
index 9fe7f64fb..4a09d5b89 100644
--- a/src/tmap.nas
+++ b/src/tmap.nas
@@ -3,7 +3,7 @@
;* The texture-mapping inner loops in pure assembly language.
;*
;*---------------------------------------------------------------------------
-;* Copyright 1998-2005 Randy Heit
+;* Copyright 1998-2006 Randy Heit
;* All rights reserved.
;*
;* Redistribution and use in source and binary forms, with or without
diff --git a/src/tmap2.nas b/src/tmap2.nas
index ff0f28af9..b3e6426b9 100644
--- a/src/tmap2.nas
+++ b/src/tmap2.nas
@@ -3,7 +3,7 @@
;* The tilted plane inner loop.
;*
;*---------------------------------------------------------------------------
-;* Copyright 1998-2005 Randy Heit
+;* Copyright 1998-2006 Randy Heit
;* All rights reserved.
;*
;* Redistribution and use in source and binary forms, with or without
diff --git a/src/v_collection.cpp b/src/v_collection.cpp
index dbfe38f2e..ed30dd3d9 100644
--- a/src/v_collection.cpp
+++ b/src/v_collection.cpp
@@ -3,7 +3,7 @@
** Holds a collection of images
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/v_collection.h b/src/v_collection.h
index f7d20fb27..be6eed119 100644
--- a/src/v_collection.h
+++ b/src/v_collection.h
@@ -2,7 +2,7 @@
** v_collection.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/v_draw.cpp b/src/v_draw.cpp
index f945ab9d8..cf9124d1e 100644
--- a/src/v_draw.cpp
+++ b/src/v_draw.cpp
@@ -3,7 +3,7 @@
** Draw patches and blocks to a canvas
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/v_font.cpp b/src/v_font.cpp
index df16cff83..ec399566d 100644
--- a/src/v_font.cpp
+++ b/src/v_font.cpp
@@ -3,7 +3,7 @@
** Font management
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/v_font.h b/src/v_font.h
index 04fe0c314..0e3813417 100644
--- a/src/v_font.h
+++ b/src/v_font.h
@@ -2,7 +2,7 @@
** v_font.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/v_palette.cpp b/src/v_palette.cpp
index 93ce7f2f8..377f7659c 100644
--- a/src/v_palette.cpp
+++ b/src/v_palette.cpp
@@ -3,7 +3,7 @@
** Automatic colormap generation for "colored lights", etc.
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/v_palette.h b/src/v_palette.h
index f26af408c..78965af25 100644
--- a/src/v_palette.h
+++ b/src/v_palette.h
@@ -2,7 +2,7 @@
** v_palette.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/v_pfx.cpp b/src/v_pfx.cpp
index aaaeb3065..4907fc998 100644
--- a/src/v_pfx.cpp
+++ b/src/v_pfx.cpp
@@ -3,7 +3,7 @@
** Pixel format conversion routines
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/v_pfx.h b/src/v_pfx.h
index fa9f7bc59..ac24c948f 100644
--- a/src/v_pfx.h
+++ b/src/v_pfx.h
@@ -2,7 +2,7 @@
** v_pfx.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/v_text.cpp b/src/v_text.cpp
index 1b8c8cbb4..7ac65d5ec 100644
--- a/src/v_text.cpp
+++ b/src/v_text.cpp
@@ -3,7 +3,7 @@
** Draws text to a canvas. Also has a text line-breaker thingy.
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/v_text.h b/src/v_text.h
index c64e6a6db..6fc24272d 100644
--- a/src/v_text.h
+++ b/src/v_text.h
@@ -2,7 +2,7 @@
** v_text.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/v_video.h b/src/v_video.h
index d5d4079a6..55f025b28 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -2,7 +2,7 @@
** v_video.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/version.h b/src/version.h
index 972c490cf..9b7017677 100644
--- a/src/version.h
+++ b/src/version.h
@@ -2,7 +2,7 @@
** version.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/weightedlist.h b/src/weightedlist.h
index 965cf75ae..93157ce76 100644
--- a/src/weightedlist.h
+++ b/src/weightedlist.h
@@ -3,7 +3,7 @@
** A weighted list template class
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/win32/hardware.cpp b/src/win32/hardware.cpp
index 8cccb885f..a8003e7dd 100644
--- a/src/win32/hardware.cpp
+++ b/src/win32/hardware.cpp
@@ -3,7 +3,7 @@
** Somewhat OS-independant interface to the screen, mouse, keyboard, and stick
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
@@ -32,216 +32,216 @@
**
*/
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include "hardware.h"
-#include "win32iface.h"
-#include "i_video.h"
-#include "i_system.h"
-#include "c_console.h"
-#include "c_cvars.h"
-#include "c_dispatch.h"
-#include "v_text.h"
-
-EXTERN_CVAR (Bool, ticker)
-EXTERN_CVAR (Bool, fullscreen)
-EXTERN_CVAR (Float, vid_winscale)
-
-bool ForceWindowed;
-
-IVideo *Video;
-//static IKeyboard *Keyboard;
-//static IMouse *Mouse;
-//static IJoystick *Joystick;
-
-void I_ShutdownHardware ()
-{
- if (screen)
- delete screen, screen = NULL;
- if (Video)
- delete Video, Video = NULL;
-}
-
-void I_InitHardware ()
-{
- UCVarValue val;
-
- val.Bool = !!Args.CheckParm ("-devparm");
- ticker.SetGenericRepDefault (val, CVAR_Bool);
- Video = new Win32Video (0);
- if (Video == NULL)
- I_FatalError ("Failed to initialize display");
-
- atterm (I_ShutdownHardware);
-
- Video->SetWindowedScale (vid_winscale);
-}
-
-/** Remaining code is common to Win32 and Linux **/
-
-// VIDEO WRAPPERS ---------------------------------------------------------
-
-EDisplayType I_DisplayType ()
-{
- return Video->GetDisplayType ();
-}
-
-DFrameBuffer *I_SetMode (int &width, int &height, DFrameBuffer *old)
-{
- bool fs = false;
- switch (Video->GetDisplayType ())
- {
- case DISPLAY_WindowOnly:
- fs = false;
- break;
- case DISPLAY_FullscreenOnly:
- fs = true;
- break;
- case DISPLAY_Both:
- if (ForceWindowed)
- {
- fs = false;
- }
- else
- {
- fs = fullscreen;
- }
- break;
- }
- DFrameBuffer *res = Video->CreateFrameBuffer (width, height, fs, old);
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
- /* Right now, CreateFrameBuffer cannot return NULL
- if (res == NULL)
- {
- I_FatalError ("Mode %dx%d is unavailable\n", width, height);
+#include "hardware.h"
+#include "win32iface.h"
+#include "i_video.h"
+#include "i_system.h"
+#include "c_console.h"
+#include "c_cvars.h"
+#include "c_dispatch.h"
+#include "v_text.h"
+
+EXTERN_CVAR (Bool, ticker)
+EXTERN_CVAR (Bool, fullscreen)
+EXTERN_CVAR (Float, vid_winscale)
+
+bool ForceWindowed;
+
+IVideo *Video;
+//static IKeyboard *Keyboard;
+//static IMouse *Mouse;
+//static IJoystick *Joystick;
+
+void I_ShutdownHardware ()
+{
+ if (screen)
+ delete screen, screen = NULL;
+ if (Video)
+ delete Video, Video = NULL;
+}
+
+void I_InitHardware ()
+{
+ UCVarValue val;
+
+ val.Bool = !!Args.CheckParm ("-devparm");
+ ticker.SetGenericRepDefault (val, CVAR_Bool);
+ Video = new Win32Video (0);
+ if (Video == NULL)
+ I_FatalError ("Failed to initialize display");
+
+ atterm (I_ShutdownHardware);
+
+ Video->SetWindowedScale (vid_winscale);
+}
+
+/** Remaining code is common to Win32 and Linux **/
+
+// VIDEO WRAPPERS ---------------------------------------------------------
+
+EDisplayType I_DisplayType ()
+{
+ return Video->GetDisplayType ();
+}
+
+DFrameBuffer *I_SetMode (int &width, int &height, DFrameBuffer *old)
+{
+ bool fs = false;
+ switch (Video->GetDisplayType ())
+ {
+ case DISPLAY_WindowOnly:
+ fs = false;
+ break;
+ case DISPLAY_FullscreenOnly:
+ fs = true;
+ break;
+ case DISPLAY_Both:
+ if (ForceWindowed)
+ {
+ fs = false;
+ }
+ else
+ {
+ fs = fullscreen;
+ }
+ break;
}
- */
- return res;
-}
-
-bool I_CheckResolution (int width, int height, int bits)
-{
- int twidth, theight;
-
- Video->FullscreenChanged (screen ? screen->IsFullscreen() : fullscreen);
- Video->StartModeIterator (bits);
- while (Video->NextMode (&twidth, &theight, NULL))
- {
- if (width == twidth && height == theight)
- return true;
- }
- return false;
-}
-
-void I_ClosestResolution (int *width, int *height, int bits)
-{
- int twidth, theight;
- int cwidth = 0, cheight = 0;
- int iteration;
+ DFrameBuffer *res = Video->CreateFrameBuffer (width, height, fs, old);
+
+ /* Right now, CreateFrameBuffer cannot return NULL
+ if (res == NULL)
+ {
+ I_FatalError ("Mode %dx%d is unavailable\n", width, height);
+ }
+ */
+ return res;
+}
+
+bool I_CheckResolution (int width, int height, int bits)
+{
+ int twidth, theight;
+
+ Video->FullscreenChanged (screen ? screen->IsFullscreen() : fullscreen);
+ Video->StartModeIterator (bits);
+ while (Video->NextMode (&twidth, &theight, NULL))
+ {
+ if (width == twidth && height == theight)
+ return true;
+ }
+ return false;
+}
+
+void I_ClosestResolution (int *width, int *height, int bits)
+{
+ int twidth, theight;
+ int cwidth = 0, cheight = 0;
+ int iteration;
DWORD closest = 4294967295u;
-
- Video->FullscreenChanged (screen ? screen->IsFullscreen() : fullscreen);
- for (iteration = 0; iteration < 2; iteration++)
- {
- Video->StartModeIterator (bits);
- while (Video->NextMode (&twidth, &theight, NULL))
- {
- if (twidth == *width && theight == *height)
- return;
-
- if (iteration == 0 && (twidth < *width || theight < *height))
- continue;
-
- DWORD dist = (twidth - *width) * (twidth - *width)
- + (theight - *height) * (theight - *height);
-
- if (dist < closest)
- {
- closest = dist;
- cwidth = twidth;
- cheight = theight;
- }
- }
- if (closest != 4294967295u)
- {
- *width = cwidth;
- *height = cheight;
- return;
- }
- }
-}
-
-void I_StartModeIterator (int bits)
-{
- Video->StartModeIterator (bits);
-}
-
-bool I_NextMode (int *width, int *height, bool *letterbox)
-{
- return Video->NextMode (width, height, letterbox);
-}
-
-DCanvas *I_NewStaticCanvas (int width, int height)
-{
- return new DSimpleCanvas (width, height);
-}
-
+
+ Video->FullscreenChanged (screen ? screen->IsFullscreen() : fullscreen);
+ for (iteration = 0; iteration < 2; iteration++)
+ {
+ Video->StartModeIterator (bits);
+ while (Video->NextMode (&twidth, &theight, NULL))
+ {
+ if (twidth == *width && theight == *height)
+ return;
+
+ if (iteration == 0 && (twidth < *width || theight < *height))
+ continue;
+
+ DWORD dist = (twidth - *width) * (twidth - *width)
+ + (theight - *height) * (theight - *height);
+
+ if (dist < closest)
+ {
+ closest = dist;
+ cwidth = twidth;
+ cheight = theight;
+ }
+ }
+ if (closest != 4294967295u)
+ {
+ *width = cwidth;
+ *height = cheight;
+ return;
+ }
+ }
+}
+
+void I_StartModeIterator (int bits)
+{
+ Video->StartModeIterator (bits);
+}
+
+bool I_NextMode (int *width, int *height, bool *letterbox)
+{
+ return Video->NextMode (width, height, letterbox);
+}
+
+DCanvas *I_NewStaticCanvas (int width, int height)
+{
+ return new DSimpleCanvas (width, height);
+}
+
extern int NewWidth, NewHeight, NewBits, DisplayBits;
-CUSTOM_CVAR (Bool, fullscreen, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
-{
- if (Video->FullscreenChanged (self))
+CUSTOM_CVAR (Bool, fullscreen, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+{
+ if (Video->FullscreenChanged (self))
{
- NewWidth = screen->GetWidth();
- NewHeight = screen->GetHeight();
- NewBits = DisplayBits;
- setmodeneeded = true;
+ NewWidth = screen->GetWidth();
+ NewHeight = screen->GetHeight();
+ NewBits = DisplayBits;
+ setmodeneeded = true;
}
-}
-
-CUSTOM_CVAR (Float, vid_winscale, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
-{
- if (self < 1.f)
- {
- self = 1.f;
- }
- else if (Video)
- {
- Video->SetWindowedScale (self);
- NewWidth = screen->GetWidth();
- NewHeight = screen->GetHeight();
- NewBits = DisplayBits;
- setmodeneeded = true;
- }
-}
-
-CCMD (vid_listmodes)
-{
- static const char *ratios[5] = { "", " - 16:9", " - 16:10", "", " - 5:4" };
- int width, height, bits;
- bool letterbox;
-
- for (bits = 1; bits <= 32; bits++)
- {
- Video->StartModeIterator (bits);
- while (Video->NextMode (&width, &height, &letterbox))
- {
- bool thisMode = (width == DisplayWidth && height == DisplayHeight && bits == DisplayBits);
- int ratio = CheckRatio (width, height);
- Printf (thisMode ? PRINT_BOLD : PRINT_HIGH,
- "%s%4d x%5d x%3d%s%s\n",
- thisMode || !(ratio & 3) ? "" : TEXTCOLOR_GOLD,
- width, height, bits,
- ratios[ratio],
- thisMode || !letterbox ? "" : TEXTCOLOR_BROWN " LB"
- );
- }
- }
-}
-
-CCMD (vid_currentmode)
-{
- Printf ("%dx%dx%d\n", DisplayWidth, DisplayHeight, DisplayBits);
-}
+}
+
+CUSTOM_CVAR (Float, vid_winscale, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+{
+ if (self < 1.f)
+ {
+ self = 1.f;
+ }
+ else if (Video)
+ {
+ Video->SetWindowedScale (self);
+ NewWidth = screen->GetWidth();
+ NewHeight = screen->GetHeight();
+ NewBits = DisplayBits;
+ setmodeneeded = true;
+ }
+}
+
+CCMD (vid_listmodes)
+{
+ static const char *ratios[5] = { "", " - 16:9", " - 16:10", "", " - 5:4" };
+ int width, height, bits;
+ bool letterbox;
+
+ for (bits = 1; bits <= 32; bits++)
+ {
+ Video->StartModeIterator (bits);
+ while (Video->NextMode (&width, &height, &letterbox))
+ {
+ bool thisMode = (width == DisplayWidth && height == DisplayHeight && bits == DisplayBits);
+ int ratio = CheckRatio (width, height);
+ Printf (thisMode ? PRINT_BOLD : PRINT_HIGH,
+ "%s%4d x%5d x%3d%s%s\n",
+ thisMode || !(ratio & 3) ? "" : TEXTCOLOR_GOLD,
+ width, height, bits,
+ ratios[ratio],
+ thisMode || !letterbox ? "" : TEXTCOLOR_BROWN " LB"
+ );
+ }
+ }
+}
+
+CCMD (vid_currentmode)
+{
+ Printf ("%dx%dx%d\n", DisplayWidth, DisplayHeight, DisplayBits);
+}
diff --git a/src/win32/hardware.h b/src/win32/hardware.h
index 8026ead45..e7477bcd1 100644
--- a/src/win32/hardware.h
+++ b/src/win32/hardware.h
@@ -2,7 +2,7 @@
** hardware.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
@@ -31,63 +31,63 @@
**
*/
-#ifndef __HARDWARE_H__
-#define __HARDWARE_H__
-
-#include "i_video.h"
-#include "v_video.h"
-
-class IVideo
-{
- public:
- virtual ~IVideo () {}
-
- virtual EDisplayType GetDisplayType () = 0;
- virtual void SetWindowedScale (float scale) = 0;
-
- virtual DFrameBuffer *CreateFrameBuffer (int width, int height, bool fs, DFrameBuffer *old) = 0;
-
- virtual bool FullscreenChanged (bool fs) = 0;
- virtual void StartModeIterator (int bits) = 0;
- virtual bool NextMode (int *width, int *height, bool *letterbox) = 0;
-};
-
-class IInputDevice
-{
- public:
- virtual ~IInputDevice () {}
- virtual void ProcessInput (bool parm) = 0;
-};
-
-class IKeyboard : public IInputDevice
-{
- public:
- virtual void ProcessInput (bool consoleOpen) = 0;
- virtual void SetKeypadRemapping (bool remap) = 0;
-};
-
-class IMouse : public IInputDevice
-{
- public:
- virtual void SetGrabbed (bool grabbed) = 0;
- virtual void ProcessInput (bool active) = 0;
-};
-
-class IJoystick : public IInputDevice
-{
- public:
- enum EJoyProp
- {
- JOYPROP_SpeedMultiplier,
- JOYPROP_XSensitivity,
- JOYPROP_YSensitivity,
- JOYPROP_XThreshold,
- JOYPROP_YThreshold
- };
- virtual void SetProperty (EJoyProp prop, float val) = 0;
-};
-
-void I_InitHardware ();
-void I_ShutdownHardware ();
-
-#endif // __HARDWARE_H__
+#ifndef __HARDWARE_H__
+#define __HARDWARE_H__
+
+#include "i_video.h"
+#include "v_video.h"
+
+class IVideo
+{
+ public:
+ virtual ~IVideo () {}
+
+ virtual EDisplayType GetDisplayType () = 0;
+ virtual void SetWindowedScale (float scale) = 0;
+
+ virtual DFrameBuffer *CreateFrameBuffer (int width, int height, bool fs, DFrameBuffer *old) = 0;
+
+ virtual bool FullscreenChanged (bool fs) = 0;
+ virtual void StartModeIterator (int bits) = 0;
+ virtual bool NextMode (int *width, int *height, bool *letterbox) = 0;
+};
+
+class IInputDevice
+{
+ public:
+ virtual ~IInputDevice () {}
+ virtual void ProcessInput (bool parm) = 0;
+};
+
+class IKeyboard : public IInputDevice
+{
+ public:
+ virtual void ProcessInput (bool consoleOpen) = 0;
+ virtual void SetKeypadRemapping (bool remap) = 0;
+};
+
+class IMouse : public IInputDevice
+{
+ public:
+ virtual void SetGrabbed (bool grabbed) = 0;
+ virtual void ProcessInput (bool active) = 0;
+};
+
+class IJoystick : public IInputDevice
+{
+ public:
+ enum EJoyProp
+ {
+ JOYPROP_SpeedMultiplier,
+ JOYPROP_XSensitivity,
+ JOYPROP_YSensitivity,
+ JOYPROP_XThreshold,
+ JOYPROP_YThreshold
+ };
+ virtual void SetProperty (EJoyProp prop, float val) = 0;
+};
+
+void I_InitHardware ();
+void I_ShutdownHardware ();
+
+#endif // __HARDWARE_H__
diff --git a/src/win32/helperthread.cpp b/src/win32/helperthread.cpp
index 98e323a10..fd1e91382 100644
--- a/src/win32/helperthread.cpp
+++ b/src/win32/helperthread.cpp
@@ -6,7 +6,7 @@
** helper thread.
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
@@ -34,262 +34,262 @@
**---------------------------------------------------------------------------
**
*/
-
-#define _WIN32_WINNT 0x0400
-#include "helperthread.h"
-
-//==========================================================================
-//
-// ---Constructor---
-//
-//==========================================================================
-
-FHelperThread::FHelperThread ()
-{
- ThreadHandle = NULL;
- ThreadID = 0;
- Thread_Events[0] = Thread_Events[1] = 0;
- memset (Messages, 0, sizeof(Messages));
- MessageHead = 0;
- MessageTail = 0;
-}
-
-//==========================================================================
-//
-// ---Destructor---
-//
-//==========================================================================
-
-FHelperThread::~FHelperThread ()
-{
- DestroyThread ();
-}
-
-//==========================================================================
-//
-// LaunchThread
-//
-//==========================================================================
-
-bool FHelperThread::LaunchThread ()
-{
- int i;
-
- MessageHead = MessageTail = 0;
- for (i = 0; i < MSG_QUEUE_SIZE; i++)
- {
- if ((Messages[i].CompletionEvent = CreateEvent (NULL, FALSE, i > 0, NULL)) == NULL)
- break;
- }
- if (i < MSG_QUEUE_SIZE)
- {
- for (; i >= 0; i--)
- {
- CloseHandle (Messages[i].CompletionEvent);
- }
- return false;
- }
- InitializeCriticalSection (&Thread_Critical);
- if ((Thread_Events[0] = CreateEvent (NULL, TRUE, FALSE, NULL)))
- {
- if ((Thread_Events[1] = CreateEvent (NULL, TRUE, FALSE, NULL)))
- {
- if ((ThreadHandle = CreateThread (NULL, 0, ThreadLaunch, (LPVOID)this, 0, &ThreadID)))
- {
- HANDLE waiters[2] = { Messages[0].CompletionEvent, ThreadHandle };
-
- if (WaitForMultipleObjects (2, waiters, FALSE, INFINITE) == WAIT_OBJECT_0+1)
- { // Init failed, and the thread exited
- DestroyThread ();
- return false;
- }
-#if defined(_MSC_VER) && defined(_DEBUG)
- // Give the thread a name in the debugger
- struct
- {
- DWORD type;
- LPCSTR name;
- DWORD threadID;
- DWORD flags;
- } info =
- {
- 0x1000, ThreadName(), ThreadID, 0
- };
- __try
- {
+
+#define _WIN32_WINNT 0x0400
+#include "helperthread.h"
+
+//==========================================================================
+//
+// ---Constructor---
+//
+//==========================================================================
+
+FHelperThread::FHelperThread ()
+{
+ ThreadHandle = NULL;
+ ThreadID = 0;
+ Thread_Events[0] = Thread_Events[1] = 0;
+ memset (Messages, 0, sizeof(Messages));
+ MessageHead = 0;
+ MessageTail = 0;
+}
+
+//==========================================================================
+//
+// ---Destructor---
+//
+//==========================================================================
+
+FHelperThread::~FHelperThread ()
+{
+ DestroyThread ();
+}
+
+//==========================================================================
+//
+// LaunchThread
+//
+//==========================================================================
+
+bool FHelperThread::LaunchThread ()
+{
+ int i;
+
+ MessageHead = MessageTail = 0;
+ for (i = 0; i < MSG_QUEUE_SIZE; i++)
+ {
+ if ((Messages[i].CompletionEvent = CreateEvent (NULL, FALSE, i > 0, NULL)) == NULL)
+ break;
+ }
+ if (i < MSG_QUEUE_SIZE)
+ {
+ for (; i >= 0; i--)
+ {
+ CloseHandle (Messages[i].CompletionEvent);
+ }
+ return false;
+ }
+ InitializeCriticalSection (&Thread_Critical);
+ if ((Thread_Events[0] = CreateEvent (NULL, TRUE, FALSE, NULL)))
+ {
+ if ((Thread_Events[1] = CreateEvent (NULL, TRUE, FALSE, NULL)))
+ {
+ if ((ThreadHandle = CreateThread (NULL, 0, ThreadLaunch, (LPVOID)this, 0, &ThreadID)))
+ {
+ HANDLE waiters[2] = { Messages[0].CompletionEvent, ThreadHandle };
+
+ if (WaitForMultipleObjects (2, waiters, FALSE, INFINITE) == WAIT_OBJECT_0+1)
+ { // Init failed, and the thread exited
+ DestroyThread ();
+ return false;
+ }
+#if defined(_MSC_VER) && defined(_DEBUG)
+ // Give the thread a name in the debugger
+ struct
+ {
+ DWORD type;
+ LPCSTR name;
+ DWORD threadID;
+ DWORD flags;
+ } info =
+ {
+ 0x1000, ThreadName(), ThreadID, 0
+ };
+ __try
+ {
RaiseException( 0x406D1388, 0, sizeof(info)/sizeof(DWORD), (DWORD*)&info );
}
__except(EXCEPTION_CONTINUE_EXECUTION)
{
}
#endif
-
- return true;
- }
- CloseHandle (Thread_Events[1]);
- }
- CloseHandle (Thread_Events[0]);
- }
- DeleteCriticalSection (&Thread_Critical);
- for (i = 0; i < MSG_QUEUE_SIZE; i++)
- {
- CloseHandle (Messages[i].CompletionEvent);
- }
- return false;
-}
-
-//==========================================================================
-//
-// DestroyThread
-//
-//==========================================================================
-
-void FHelperThread::DestroyThread ()
-{
- int i;
-
- if (ThreadHandle == NULL)
- return;
-
- SetEvent (Thread_Events[THREAD_KillSelf]);
- // 5 seconds should be sufficient. If not, then we'll crash, but at
- // least that's better than hanging indefinitely.
- WaitForSingleObject (ThreadHandle, 5000);
- CloseHandle (ThreadHandle);
-
- EnterCriticalSection (&Thread_Critical);
-
- for (i = 0; i < 8; i++)
- {
- CloseHandle (Messages[i].CompletionEvent);
- }
- CloseHandle (Thread_Events[0]);
- CloseHandle (Thread_Events[1]);
-
- LeaveCriticalSection (&Thread_Critical);
- DeleteCriticalSection (&Thread_Critical);
-
- ThreadHandle = NULL;
-}
-
-//==========================================================================
-//
-// HaveThread
-//
-//==========================================================================
-
-bool FHelperThread::HaveThread () const
-{
- return ThreadHandle != NULL;
-}
-
-//==========================================================================
-//
-// SendMessage
-//
-//==========================================================================
-
-DWORD FHelperThread::SendMessage (DWORD method,
- DWORD parm1, DWORD parm2, DWORD parm3, bool wait)
-{
- for (;;)
- {
- EnterCriticalSection (&Thread_Critical);
- if (MessageHead - MessageTail == MSG_QUEUE_SIZE)
- { // No room, so wait for oldest message to complete
- HANDLE waitEvent = Messages[MessageTail].CompletionEvent;
- LeaveCriticalSection (&Thread_Critical);
- WaitForSingleObject (waitEvent, 1000);
- }
-
- int head = MessageHead++ % MSG_QUEUE_SIZE;
- Messages[head].Method = method;
- Messages[head].Parm1 = parm1;
- Messages[head].Parm2 = parm2;
- Messages[head].Parm3 = parm3;
- ResetEvent (Messages[head].CompletionEvent);
- LeaveCriticalSection (&Thread_Critical);
-
- SetEvent (Thread_Events[THREAD_NewMessage]);
-
- if (wait)
- {
- WaitForSingleObject (Messages[head].CompletionEvent, INFINITE);
- return Messages[head].Return;
- }
- return 0;
- }
-}
-
-//==========================================================================
-//
-// ThreadLaunch (static)
-//
-//==========================================================================
-
-DWORD WINAPI FHelperThread::ThreadLaunch (LPVOID me)
-{
- return ((FHelperThread *)me)->ThreadLoop ();
-}
-
-//==========================================================================
-//
-// ThreadLoop
-//
-//==========================================================================
-
-DWORD FHelperThread::ThreadLoop ()
-{
- if (!Init ())
- {
- ExitThread (0);
- }
- else
- {
- SetEvent (Messages[0].CompletionEvent);
- }
-
- for (;;)
- {
- switch (MsgWaitForMultipleObjects (2, Thread_Events,
- FALSE, INFINITE, QS_ALLEVENTS))
- {
- case WAIT_OBJECT_0+1:
- // We should quit now.
- Deinit ();
- ExitThread (0);
- break;
-
- case WAIT_OBJECT_0:
- // Process any new messages. MessageTail is not updated until *after*
- // the message is finished processing.
- for (;;)
- {
- EnterCriticalSection (&Thread_Critical);
- if (MessageHead == MessageTail)
- {
- ResetEvent (Thread_Events[0]);
- LeaveCriticalSection (&Thread_Critical);
- break; // Resume outer for (Wait for more messages)
- }
- int spot = MessageTail % MSG_QUEUE_SIZE;
- LeaveCriticalSection (&Thread_Critical);
-
- Messages[spot].Return = Dispatch (Messages[spot].Method,
- Messages[spot].Parm1, Messages[spot].Parm2,
- Messages[spot].Parm3);
-
- // No need to enter critical section, because only the CD thread
- // is allowed to touch MessageTail or signal the CompletionEvent
- SetEvent (Messages[spot].CompletionEvent);
- MessageTail++;
- }
- break;
-
- default:
- DefaultDispatch ();
- }
- }
-
- return 0;
-}
+
+ return true;
+ }
+ CloseHandle (Thread_Events[1]);
+ }
+ CloseHandle (Thread_Events[0]);
+ }
+ DeleteCriticalSection (&Thread_Critical);
+ for (i = 0; i < MSG_QUEUE_SIZE; i++)
+ {
+ CloseHandle (Messages[i].CompletionEvent);
+ }
+ return false;
+}
+
+//==========================================================================
+//
+// DestroyThread
+//
+//==========================================================================
+
+void FHelperThread::DestroyThread ()
+{
+ int i;
+
+ if (ThreadHandle == NULL)
+ return;
+
+ SetEvent (Thread_Events[THREAD_KillSelf]);
+ // 5 seconds should be sufficient. If not, then we'll crash, but at
+ // least that's better than hanging indefinitely.
+ WaitForSingleObject (ThreadHandle, 5000);
+ CloseHandle (ThreadHandle);
+
+ EnterCriticalSection (&Thread_Critical);
+
+ for (i = 0; i < 8; i++)
+ {
+ CloseHandle (Messages[i].CompletionEvent);
+ }
+ CloseHandle (Thread_Events[0]);
+ CloseHandle (Thread_Events[1]);
+
+ LeaveCriticalSection (&Thread_Critical);
+ DeleteCriticalSection (&Thread_Critical);
+
+ ThreadHandle = NULL;
+}
+
+//==========================================================================
+//
+// HaveThread
+//
+//==========================================================================
+
+bool FHelperThread::HaveThread () const
+{
+ return ThreadHandle != NULL;
+}
+
+//==========================================================================
+//
+// SendMessage
+//
+//==========================================================================
+
+DWORD FHelperThread::SendMessage (DWORD method,
+ DWORD parm1, DWORD parm2, DWORD parm3, bool wait)
+{
+ for (;;)
+ {
+ EnterCriticalSection (&Thread_Critical);
+ if (MessageHead - MessageTail == MSG_QUEUE_SIZE)
+ { // No room, so wait for oldest message to complete
+ HANDLE waitEvent = Messages[MessageTail].CompletionEvent;
+ LeaveCriticalSection (&Thread_Critical);
+ WaitForSingleObject (waitEvent, 1000);
+ }
+
+ int head = MessageHead++ % MSG_QUEUE_SIZE;
+ Messages[head].Method = method;
+ Messages[head].Parm1 = parm1;
+ Messages[head].Parm2 = parm2;
+ Messages[head].Parm3 = parm3;
+ ResetEvent (Messages[head].CompletionEvent);
+ LeaveCriticalSection (&Thread_Critical);
+
+ SetEvent (Thread_Events[THREAD_NewMessage]);
+
+ if (wait)
+ {
+ WaitForSingleObject (Messages[head].CompletionEvent, INFINITE);
+ return Messages[head].Return;
+ }
+ return 0;
+ }
+}
+
+//==========================================================================
+//
+// ThreadLaunch (static)
+//
+//==========================================================================
+
+DWORD WINAPI FHelperThread::ThreadLaunch (LPVOID me)
+{
+ return ((FHelperThread *)me)->ThreadLoop ();
+}
+
+//==========================================================================
+//
+// ThreadLoop
+//
+//==========================================================================
+
+DWORD FHelperThread::ThreadLoop ()
+{
+ if (!Init ())
+ {
+ ExitThread (0);
+ }
+ else
+ {
+ SetEvent (Messages[0].CompletionEvent);
+ }
+
+ for (;;)
+ {
+ switch (MsgWaitForMultipleObjects (2, Thread_Events,
+ FALSE, INFINITE, QS_ALLEVENTS))
+ {
+ case WAIT_OBJECT_0+1:
+ // We should quit now.
+ Deinit ();
+ ExitThread (0);
+ break;
+
+ case WAIT_OBJECT_0:
+ // Process any new messages. MessageTail is not updated until *after*
+ // the message is finished processing.
+ for (;;)
+ {
+ EnterCriticalSection (&Thread_Critical);
+ if (MessageHead == MessageTail)
+ {
+ ResetEvent (Thread_Events[0]);
+ LeaveCriticalSection (&Thread_Critical);
+ break; // Resume outer for (Wait for more messages)
+ }
+ int spot = MessageTail % MSG_QUEUE_SIZE;
+ LeaveCriticalSection (&Thread_Critical);
+
+ Messages[spot].Return = Dispatch (Messages[spot].Method,
+ Messages[spot].Parm1, Messages[spot].Parm2,
+ Messages[spot].Parm3);
+
+ // No need to enter critical section, because only the CD thread
+ // is allowed to touch MessageTail or signal the CompletionEvent
+ SetEvent (Messages[spot].CompletionEvent);
+ MessageTail++;
+ }
+ break;
+
+ default:
+ DefaultDispatch ();
+ }
+ }
+
+ return 0;
+}
diff --git a/src/win32/helperthread.h b/src/win32/helperthread.h
index 44d9b5df6..286b840a1 100644
--- a/src/win32/helperthread.h
+++ b/src/win32/helperthread.h
@@ -2,7 +2,7 @@
** helperthread.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
@@ -31,55 +31,55 @@
**
*/
-#ifndef __HELPERTHREAD_H__
-#define __HELPERTHREAD_H__
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-class FHelperThread
-{
- struct Message
- {
- DWORD Method;
- DWORD Parm1, Parm2, Parm3;
- HANDLE CompletionEvent; // Set to signalled when message is finished processing
- DWORD Return;
- };
-
- enum { MSG_QUEUE_SIZE = 8 };
-
-public:
- FHelperThread ();
- virtual ~FHelperThread ();
- void DestroyThread ();
-
- bool LaunchThread ();
- DWORD SendMessage (DWORD method, DWORD parm1, DWORD parm2,
- DWORD parm3, bool wait);
- bool HaveThread () const;
-
-protected:
- enum EThreadEvents { THREAD_NewMessage, THREAD_KillSelf };
- virtual bool Init () { return true; }
- virtual void Deinit () {}
- virtual void DefaultDispatch () {}
- virtual DWORD Dispatch (DWORD method, DWORD parm1=0, DWORD parm2=0, DWORD parm3=0) = 0;
- virtual const char *ThreadName () = 0;
-
- HANDLE ThreadHandle;
- DWORD ThreadID;
- HANDLE Thread_Events[2];
- CRITICAL_SECTION Thread_Critical;
- Message Messages[MSG_QUEUE_SIZE];
- DWORD MessageHead;
- DWORD MessageTail;
-
-private:
- void ReleaseSynchronizers ();
- static DWORD WINAPI ThreadLaunch (LPVOID me);
-
- DWORD ThreadLoop ();
-};
-
-#endif //__HELPERTHREAD_H__
+#ifndef __HELPERTHREAD_H__
+#define __HELPERTHREAD_H__
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+class FHelperThread
+{
+ struct Message
+ {
+ DWORD Method;
+ DWORD Parm1, Parm2, Parm3;
+ HANDLE CompletionEvent; // Set to signalled when message is finished processing
+ DWORD Return;
+ };
+
+ enum { MSG_QUEUE_SIZE = 8 };
+
+public:
+ FHelperThread ();
+ virtual ~FHelperThread ();
+ void DestroyThread ();
+
+ bool LaunchThread ();
+ DWORD SendMessage (DWORD method, DWORD parm1, DWORD parm2,
+ DWORD parm3, bool wait);
+ bool HaveThread () const;
+
+protected:
+ enum EThreadEvents { THREAD_NewMessage, THREAD_KillSelf };
+ virtual bool Init () { return true; }
+ virtual void Deinit () {}
+ virtual void DefaultDispatch () {}
+ virtual DWORD Dispatch (DWORD method, DWORD parm1=0, DWORD parm2=0, DWORD parm3=0) = 0;
+ virtual const char *ThreadName () = 0;
+
+ HANDLE ThreadHandle;
+ DWORD ThreadID;
+ HANDLE Thread_Events[2];
+ CRITICAL_SECTION Thread_Critical;
+ Message Messages[MSG_QUEUE_SIZE];
+ DWORD MessageHead;
+ DWORD MessageTail;
+
+private:
+ void ReleaseSynchronizers ();
+ static DWORD WINAPI ThreadLaunch (LPVOID me);
+
+ DWORD ThreadLoop ();
+};
+
+#endif //__HELPERTHREAD_H__
diff --git a/src/win32/i_cd.cpp b/src/win32/i_cd.cpp
index c852f55bc..54c65dde4 100644
--- a/src/win32/i_cd.cpp
+++ b/src/win32/i_cd.cpp
@@ -3,7 +3,7 @@
** Functions for controlling CD playback
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/win32/i_crash.cpp b/src/win32/i_crash.cpp
index 19822e036..a8cdbea17 100644
--- a/src/win32/i_crash.cpp
+++ b/src/win32/i_crash.cpp
@@ -3,7 +3,7 @@
** Gathers exception information when the program crashes.
**
**---------------------------------------------------------------------------
-** Copyright 2002-2005 Randy Heit
+** Copyright 2002-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/win32/i_input.cpp b/src/win32/i_input.cpp
index 53df838d9..1cdecc1bc 100644
--- a/src/win32/i_input.cpp
+++ b/src/win32/i_input.cpp
@@ -3,7 +3,7 @@
** Handles input from keyboard, mouse, and joystick
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/win32/i_input.h b/src/win32/i_input.h
index b87d79a1b..7f300d2d0 100644
--- a/src/win32/i_input.h
+++ b/src/win32/i_input.h
@@ -2,7 +2,7 @@
** i_input.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/win32/i_movie.cpp b/src/win32/i_movie.cpp
index 59d360761..b3b607d25 100644
--- a/src/win32/i_movie.cpp
+++ b/src/win32/i_movie.cpp
@@ -2,7 +2,7 @@
** i_movie.cpp
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/win32/win32iface.h b/src/win32/win32iface.h
index 0c6906565..aa2c38638 100644
--- a/src/win32/win32iface.h
+++ b/src/win32/win32iface.h
@@ -2,7 +2,7 @@
** win32iface.h
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
@@ -31,62 +31,62 @@
**
*/
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddraw.h>
-
-#include "hardware.h"
-#include "v_video.h"
-
-class Win32Video : public IVideo
-{
- public:
- Win32Video (int parm);
- ~Win32Video ();
-
- EDisplayType GetDisplayType () { return DISPLAY_Both; }
- bool FullscreenChanged (bool fs);
- void SetWindowedScale (float scale);
-
- DFrameBuffer *CreateFrameBuffer (int width, int height, bool fs, DFrameBuffer *old);
-
- void StartModeIterator (int bits);
- bool NextMode (int *width, int *height, bool *letterbox);
-
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <ddraw.h>
+
+#include "hardware.h"
+#include "v_video.h"
+
+class Win32Video : public IVideo
+{
+ public:
+ Win32Video (int parm);
+ ~Win32Video ();
+
+ EDisplayType GetDisplayType () { return DISPLAY_Both; }
+ bool FullscreenChanged (bool fs);
+ void SetWindowedScale (float scale);
+
+ DFrameBuffer *CreateFrameBuffer (int width, int height, bool fs, DFrameBuffer *old);
+
+ void StartModeIterator (int bits);
+ bool NextMode (int *width, int *height, bool *letterbox);
+
bool GoFullscreen (bool yes);
- void BlankForGDI ();
-
- private:
- struct ModeInfo
- {
- ModeInfo (int inX, int inY, int inBits, int inRealY)
- : next (NULL),
- width (inX),
- height (inY),
- bits (inBits),
- realheight (inRealY)
- {}
-
- ModeInfo *next;
- int width, height, bits;
- int realheight;
- } *m_Modes;
-
- ModeInfo *m_IteratorMode;
- int m_IteratorBits;
- bool m_IteratorFS;
- bool m_IsFullscreen;
-
+ void BlankForGDI ();
+
+ private:
+ struct ModeInfo
+ {
+ ModeInfo (int inX, int inY, int inBits, int inRealY)
+ : next (NULL),
+ width (inX),
+ height (inY),
+ bits (inBits),
+ realheight (inRealY)
+ {}
+
+ ModeInfo *next;
+ int width, height, bits;
+ int realheight;
+ } *m_Modes;
+
+ ModeInfo *m_IteratorMode;
+ int m_IteratorBits;
+ bool m_IteratorFS;
+ bool m_IsFullscreen;
+
bool m_CalledCoInitialize;
- void AddMode (int x, int y, int bits, int baseHeight);
- void FreeModes ();
-
- void NewDDMode (int x, int y);
+ void AddMode (int x, int y, int bits, int baseHeight);
+ void FreeModes ();
+
+ void NewDDMode (int x, int y);
static HRESULT WINAPI EnumDDModesCB (LPDDSURFACEDESC desc, void *modes);
friend class DDrawFB;
-};
+};
class BaseWinFB : public DFrameBuffer
{
@@ -134,8 +134,8 @@ public:
bool PaintToWindow ();
void DoSpeedTest ();
-private:
- enum LockSurfRes { NoGood, Good, GoodWasLost };
+private:
+ enum LockSurfRes { NoGood, Good, GoodWasLost };
bool CreateResources ();
void ReleaseResources ();
diff --git a/src/win32/win32video.cpp b/src/win32/win32video.cpp
index 39df9fe33..2850a9d75 100644
--- a/src/win32/win32video.cpp
+++ b/src/win32/win32video.cpp
@@ -3,7 +3,7 @@
** Code to let ZDoom use DirectDraw
**
**---------------------------------------------------------------------------
-** Copyright 1998-2005 Randy Heit
+** Copyright 1998-2006 Randy Heit
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
diff --git a/src/win32/zdoom.rc b/src/win32/zdoom.rc
index 4c29489b4..9d3badd51 100644
--- a/src/win32/zdoom.rc
+++ b/src/win32/zdoom.rc
@@ -38,6 +38,11 @@ BEGIN
"\0"
END
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+END
+
#endif // APSTUDIO_INVOKED
@@ -181,13 +186,13 @@ BEGIN
VALUE "Comments", "Thanks to id Software for creating DOOM and then releasing the source code. Thanks also to TeamTNT for creating BOOM, which ZDoom is partially based on. Includes code based on the Cajun Bot 0.97 by Martin Collberg."
VALUE "CompanyName", " "
VALUE "FileDescription", "ZDoom"
- VALUE "FileVersion", "2.0.99"
+ VALUE "FileVersion", "2.0.99 does not exist"
VALUE "InternalName", "ZDoom"
- VALUE "LegalCopyright", "Copyright � 1993-1996, id Software & 1998-2005, Randy Heit"
+ VALUE "LegalCopyright", "Copyright � 1993-1996, id Software & 1998-2006, Randy Heit"
VALUE "LegalTrademarks", "Doom� is a Registered Trademark of id Software, Inc."
VALUE "OriginalFilename", "zdoom.exe"
VALUE "ProductName", "ZDoom"
- VALUE "ProductVersion", "2.0"
+ VALUE "ProductVersion", "2.1"
END
END
BLOCK "VarFileInfo"
@@ -203,8 +208,7 @@ END
//
IDD_FMODINITFAILED DIALOGEX 0, 0, 186, 62
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP |
- WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW
CAPTION "ZDoom Sound Initialization Failure"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -212,39 +216,30 @@ BEGIN
DEFPUSHBUTTON "Retry",IDOK,129,7,50,14,WS_GROUP
PUSHBUTTON "No Sound",IDC_NOSOUND,129,24,50,14,WS_GROUP
PUSHBUTTON "Quit",IDCANCEL,129,41,50,14,WS_GROUP
- LTEXT "Could not initialize sound. If the sound hardware is in use, stop the other program that is making sound and click Retry. Alternatively, click No Sound to play without sound.",
- IDC_STATIC,7,7,116,42
+ LTEXT "Could not initialize sound. If the sound hardware is in use, stop the other program that is making sound and click Retry. Alternatively, click No Sound to play without sound.",IDC_STATIC,7,7,116,42
END
IDD_IWADDIALOG DIALOGEX 0, 0, 212, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP |
- WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW
CAPTION "Select an IWAD to use"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- LISTBOX IDC_IWADLIST,5,25,200,124,LBS_NOINTEGRALHEIGHT |
- WS_VSCROLL | WS_TABSTOP
- CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,61,153,89,10
+ LISTBOX IDC_IWADLIST,5,25,200,124,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,61,153,89,10
DEFPUSHBUTTON "OK",IDOK,5,165,50,14
PUSHBUTTON "Cancel",IDCANCEL,155,165,50,14
- LTEXT "ZDoom found more than one IWAD present.",IDC_STATIC,5,5,
- 140,8
- LTEXT "Select from the list below to determine which one to use:",
- IDC_STATIC,5,15,200,8
+ LTEXT "ZDoom found more than one IWAD present.",IDC_STATIC,5,5,140,8
+ LTEXT "Select from the list below to determine which one to use:",IDC_STATIC,5,15,200,8
END
IDD_EAXPROPERTYLIST DIALOGEX 0, 0, 265, 404
-STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD |
- WS_VSCROLL
+STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VSCROLL
EXSTYLE WS_EX_CLIENTEDGE
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- EDITTEXT IDCE_ENVIRONMENTSIZE,76,7,48,12,ES_AUTOHSCROLL,
- WS_EX_RIGHT
- EDITTEXT IDCE_ENVIRONMENTDIFFUSION,76,20,48,12,ES_AUTOHSCROLL,
- WS_EX_RIGHT
+ EDITTEXT IDCE_ENVIRONMENTSIZE,76,7,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
+ EDITTEXT IDCE_ENVIRONMENTDIFFUSION,76,20,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_ROOM,76,33,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_ROOMHF,76,46,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_ROOMLF,76,59,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
@@ -252,102 +247,60 @@ BEGIN
EDITTEXT IDCE_DECAYHFRATIO,76,85,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_DECAYLFRATIO,76,98,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_REFLECTIONS,76,111,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
- EDITTEXT IDCE_REFLECTIONSDELAY,76,124,48,12,ES_AUTOHSCROLL,
- WS_EX_RIGHT
+ EDITTEXT IDCE_REFLECTIONSDELAY,76,124,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_REVERB,76,137,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_REVERBDELAY,76,150,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_ECHOTIME,76,163,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_ECHODEPTH,76,176,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
- EDITTEXT IDCE_MODULATIONTIME,76,189,48,12,ES_AUTOHSCROLL,
- WS_EX_RIGHT
- EDITTEXT IDCE_MODULATIONDEPTH,76,202,48,12,ES_AUTOHSCROLL,
- WS_EX_RIGHT
- EDITTEXT IDCE_AIRABSORPTIONHF,76,215,48,12,ES_AUTOHSCROLL,
- WS_EX_RIGHT
+ EDITTEXT IDCE_MODULATIONTIME,76,189,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
+ EDITTEXT IDCE_MODULATIONDEPTH,76,202,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
+ EDITTEXT IDCE_AIRABSORPTIONHF,76,215,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_HFREFERENCE,76,228,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_LFREFERENCE,76,241,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
- EDITTEXT IDCE_ROOMROLLOFFFACTOR,76,254,48,12,ES_AUTOHSCROLL,
- WS_EX_RIGHT
- EDITTEXT IDCE_REFLECTIONSPANX,76,267,48,12,ES_AUTOHSCROLL,
- WS_EX_RIGHT
- EDITTEXT IDCE_REFLECTIONSPANY,76,280,48,12,ES_AUTOHSCROLL,
- WS_EX_RIGHT
- EDITTEXT IDCE_REFLECTIONSPANZ,76,293,48,12,ES_AUTOHSCROLL,
- WS_EX_RIGHT
+ EDITTEXT IDCE_ROOMROLLOFFFACTOR,76,254,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
+ EDITTEXT IDCE_REFLECTIONSPANX,76,267,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
+ EDITTEXT IDCE_REFLECTIONSPANY,76,280,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
+ EDITTEXT IDCE_REFLECTIONSPANZ,76,293,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_REVERBPANX,76,306,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_REVERBPANY,76,319,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
EDITTEXT IDCE_REVERBPANZ,76,332,48,12,ES_AUTOHSCROLL,WS_EX_RIGHT
- CONTROL "",IDCS_ENVIRONMENTSIZE,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,7,123,12
- CONTROL "",IDCS_ENVIRONMENTDIFFUSION,"msctls_trackbar32",
- TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,20,123,12
- CONTROL "",IDCS_ROOM,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS |
- WS_TABSTOP,126,33,123,12
- CONTROL "",IDCS_ROOMHF,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,46,123,12
- CONTROL "",IDCS_ROOMLF,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,59,123,12
- CONTROL "",IDCS_DECAYTIME,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,72,123,12
- CONTROL "",IDCS_DECAYHFRATIO,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,85,123,12
- CONTROL "",IDCS_DECAYLFRATIO,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,98,123,12
- CONTROL "",IDCS_REFLECTIONS,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,111,123,12
- CONTROL "",IDCS_REFLECTIONSDELAY,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,124,123,12
- CONTROL "",IDCS_REVERB,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,137,123,12
- CONTROL "",IDCS_REVERBDELAY,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,150,123,12
- CONTROL "",IDCS_ECHOTIME,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,163,123,12
- CONTROL "",IDCS_ECHODEPTH,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,176,123,12
- CONTROL "",IDCS_MODULATIONTIME,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,189,123,12
- CONTROL "",IDCS_MODULATIONDEPTH,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,202,123,12
- CONTROL "",IDCS_AIRABSORPTIONHF,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,215,123,12
- CONTROL "",IDCS_HFREFERENCE,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,228,123,12
- CONTROL "",IDCS_LFREFERENCE,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,241,123,12
- CONTROL "",IDCS_ROOMROLLOFFFACTOR,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,254,123,12
- CONTROL "",IDCS_REFLECTIONSPANX,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,267,123,12
- CONTROL "",IDCS_REFLECTIONSPANY,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,280,123,12
- CONTROL "",IDCS_REFLECTIONSPANZ,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,293,123,12
- CONTROL "",IDCS_REVERBPANX,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,306,123,12
- CONTROL "",IDCS_REVERBPANY,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,319,123,12
- CONTROL "",IDCS_REVERBPANZ,"msctls_trackbar32",TBS_BOTH |
- TBS_NOTICKS | WS_TABSTOP,126,332,123,12
- CONTROL "Reflections Scale",IDC_REFLECTIONSSCALE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,19,353,70,10
+ CONTROL "",IDCS_ENVIRONMENTSIZE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,7,123,12
+ CONTROL "",IDCS_ENVIRONMENTDIFFUSION,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,20,123,12
+ CONTROL "",IDCS_ROOM,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,33,123,12
+ CONTROL "",IDCS_ROOMHF,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,46,123,12
+ CONTROL "",IDCS_ROOMLF,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,59,123,12
+ CONTROL "",IDCS_DECAYTIME,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,72,123,12
+ CONTROL "",IDCS_DECAYHFRATIO,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,85,123,12
+ CONTROL "",IDCS_DECAYLFRATIO,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,98,123,12
+ CONTROL "",IDCS_REFLECTIONS,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,111,123,12
+ CONTROL "",IDCS_REFLECTIONSDELAY,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,124,123,12
+ CONTROL "",IDCS_REVERB,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,137,123,12
+ CONTROL "",IDCS_REVERBDELAY,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,150,123,12
+ CONTROL "",IDCS_ECHOTIME,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,163,123,12
+ CONTROL "",IDCS_ECHODEPTH,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,176,123,12
+ CONTROL "",IDCS_MODULATIONTIME,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,189,123,12
+ CONTROL "",IDCS_MODULATIONDEPTH,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,202,123,12
+ CONTROL "",IDCS_AIRABSORPTIONHF,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,215,123,12
+ CONTROL "",IDCS_HFREFERENCE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,228,123,12
+ CONTROL "",IDCS_LFREFERENCE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,241,123,12
+ CONTROL "",IDCS_ROOMROLLOFFFACTOR,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,254,123,12
+ CONTROL "",IDCS_REFLECTIONSPANX,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,267,123,12
+ CONTROL "",IDCS_REFLECTIONSPANY,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,280,123,12
+ CONTROL "",IDCS_REFLECTIONSPANZ,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,293,123,12
+ CONTROL "",IDCS_REVERBPANX,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,306,123,12
+ CONTROL "",IDCS_REVERBPANY,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,319,123,12
+ CONTROL "",IDCS_REVERBPANZ,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,126,332,123,12
+ CONTROL "Reflections Scale",IDC_REFLECTIONSSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,353,70,10
CONTROL "Reflections Delay Scale",IDC_REFLECTIONSDELAYSCALE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,366,90,10
- CONTROL "Decay Time Scale",IDC_DECAYTIMESCALE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,19,377,71,10
- CONTROL "Decay HF Limit",IDC_DECAYHFLIMIT,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,19,390,63,10
- CONTROL "Reverb Scale",IDC_REVERBSCALE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,139,353,58,10
- CONTROL "Reverb Delay Scale",IDC_REVERBDELAYSCALE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,139,366,78,10
- CONTROL "Echo Time Scale",IDC_ECHOTIMESCALE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,139,377,67,10
- CONTROL "Modulation Time Scale",IDC_MODULATIONTIMESCALE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,139,390,86,10
+ CONTROL "Decay Time Scale",IDC_DECAYTIMESCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,377,71,10
+ CONTROL "Decay HF Limit",IDC_DECAYHFLIMIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,390,63,10
+ CONTROL "Reverb Scale",IDC_REVERBSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,353,58,10
+ CONTROL "Reverb Delay Scale",IDC_REVERBDELAYSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,366,78,10
+ CONTROL "Echo Time Scale",IDC_ECHOTIMESCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,377,67,10
+ CONTROL "Modulation Time Scale",IDC_MODULATIONTIMESCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,390,86,10
LTEXT "Environment Size",IDC_STATIC,17,9,56,8,0,WS_EX_RIGHT
- LTEXT "Environment Diffusion",IDC_STATIC,2,22,71,8,0,
- WS_EX_RIGHT
+ LTEXT "Environment Diffusion",IDC_STATIC,2,22,71,8,0,WS_EX_RIGHT
LTEXT "Room",IDC_STATIC,53,35,19,8,0,WS_EX_RIGHT
LTEXT "Room HF",IDC_STATIC,43,48,30,8,0,WS_EX_RIGHT
LTEXT "Room LF",IDC_STATIC,45,60,28,8,0,WS_EX_RIGHT
@@ -371,29 +324,23 @@ BEGIN
LTEXT "Air Absorption HF",IDC_STATIC,16,215,57,8,0,WS_EX_RIGHT
LTEXT "HF Reference",IDC_STATIC,28,228,45,8,0,WS_EX_RIGHT
LTEXT "LF Reference",IDC_STATIC,29,241,44,8,0,WS_EX_RIGHT
- LTEXT "Room Rolloff Factor",IDC_STATIC,9,254,64,8,0,
- WS_EX_RIGHT
+ LTEXT "Room Rolloff Factor",IDC_STATIC,9,254,64,8,0,WS_EX_RIGHT
END
IDD_EAXEDIT DIALOGEX 0, 0, 280, 326
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE |
- WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
- WS_THICKFRAME
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
CAPTION "EAX Environment Editor"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- COMBOBOX IDC_CURRENTENVIRONMENT,7,19,265,14,CBS_DROPDOWNLIST |
- CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_CURRENTENVIRONMENT,7,19,265,14,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
LTEXT "Static",IDC_DUMMY,7,36,265,263,0,WS_EX_CLIENTEDGE
PUSHBUTTON "&New...",IDC_NEW,8,305,45,14
PUSHBUTTON "&Save...",IDC_SAVE,60,305,45,14
PUSHBUTTON "&Revert",IDC_REVERT,112,305,45,14
- CONTROL "&Test in level",IDC_TESTEAX,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,165,307,54,10
+ CONTROL "&Test in level",IDC_TESTEAX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,307,54,10
PUSHBUTTON "&Done",IDOK,228,305,45,14
- CONTROL "Show &IDs in List",IDC_SHOWIDS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,7,66,10
+ CONTROL "Show &IDs in List",IDC_SHOWIDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,66,10
LTEXT "ID 2:",IDC_STATIC,239,7,19,8
LTEXT "ID 1:",IDC_STATIC,198,7,19,8
LTEXT "255",IDC_ID2,258,7,15,8
@@ -401,23 +348,16 @@ BEGIN
END
IDD_NEWEAX DIALOGEX 0, 0, 348, 257
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUP |
- WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Create New EAX Environment..."
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
EDITTEXT IDC_NEWENVNAME,32,216,187,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDITID1,248,216,32,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "",IDC_SPINID1,"msctls_updown32",UDS_SETBUDDYINT |
- UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,236,216,
- 11,14
+ CONTROL "",IDC_SPINID1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,236,216,11,14
EDITTEXT IDC_EDITID2,309,216,32,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "",IDC_SPINID2,"msctls_updown32",UDS_SETBUDDYINT |
- UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,297,216,
- 11,14
- CONTROL "",IDC_ENVIRONMENTLIST,"SysListView32",LVS_LIST |
- LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING |
- LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,18,334,192
+ CONTROL "",IDC_SPINID2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,297,216,11,14
+ CONTROL "",IDC_ENVIRONMENTLIST,"SysListView32",LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,18,334,192
DEFPUSHBUTTON "Create",IDOK,246,236,45,14
PUSHBUTTON "Cancel",IDCANCEL,296,236,45,14
LTEXT "Name:",IDC_STATIC,7,218,22,8
@@ -427,23 +367,18 @@ BEGIN
END
IDD_SAVEEAX DIALOGEX 0, 0, 394, 95
-STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD |
- WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_SYSMENU
+STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_SYSMENU
EXSTYLE WS_EX_TRANSPARENT
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- GROUPBOX "Include these environments:",IDC_SAVEGROUP,6,0,371,90,0,
- WS_EX_TRANSPARENT
- CONTROL "",IDC_ENVLIST,"SysListView32",LVS_LIST |
- LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_ALIGNLEFT |
- WS_BORDER | WS_TABSTOP,12,12,303,72
+ GROUPBOX "Include these environments:",IDC_SAVEGROUP,6,0,371,90,0,WS_EX_TRANSPARENT
+ CONTROL "",IDC_ENVLIST,"SysListView32",LVS_LIST | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,12,12,303,72
PUSHBUTTON "Select All",IDC_SELECTALL,320,12,50,14
PUSHBUTTON "Select None",IDC_SELECTNONE,320,31,50,14
END
IDD_CRASHDIALOG DIALOGEX 0, 0, 405, 308
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS |
- DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT | WS_EX_APPWINDOW
CAPTION "ZDoom Very Fatal Error"
FONT 8, "MS Shell Dlg", 400, 0, 0x0
@@ -458,16 +393,11 @@ IDD_CRASHOVERVIEW DIALOGEX 1, 13, 391, 264
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- EDITTEXT IDC_CRASHINFO,7,126,377,90,ES_MULTILINE | ES_AUTOVSCROLL |
- ES_WANTRETURN | WS_VSCROLL
- CONTROL "",IDC_PLEASETELLUS,"RichEdit20A",ES_MULTILINE |
- ES_READONLY,7,50,377,54,WS_EX_TRANSPARENT
- LTEXT "(Optional) To help diagnose the cause of this error, please describe what you were doing when the error occured. If you were playing with custom wads, please also indicate where to obtain them:",
- IDC_STATIC,7,108,377,16,0,WS_EX_TRANSPARENT
+ EDITTEXT IDC_CRASHINFO,7,126,377,90,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
+ CONTROL "",IDC_PLEASETELLUS,"RichEdit20A",ES_MULTILINE | ES_READONLY,7,50,377,54,WS_EX_TRANSPARENT
+ LTEXT "(Optional) To help diagnose the cause of this error, please describe what you were doing when the error occured. If you were playing with custom wads, please also indicate where to obtain them:",IDC_STATIC,7,108,377,16,0,WS_EX_TRANSPARENT
CONTROL 131,IDC_DEADGUYVIEWER,"Static",SS_BITMAP,345,7,23,26
- CONTROL "",IDC_CRASHHEADER,"RichEdit20A",ES_MULTILINE |
- ES_AUTOHSCROLL | ES_READONLY,18,13,306,25,
- WS_EX_TRANSPARENT
+ CONTROL "",IDC_CRASHHEADER,"RichEdit20A",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY,18,13,306,25,WS_EX_TRANSPARENT
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,42,407,1
GROUPBOX "Summary",IDC_STATIC,7,223,377,34
LTEXT "Static",IDC_CRASHSUMMARY,14,233,363,20
@@ -477,21 +407,15 @@ IDD_CRASHDETAILS DIALOGEX 0, 0, 391, 164
STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- LTEXT "The error report contains these files:",IDC_STATIC,7,5,
- 119,8
- LTEXT "The selected file contains this information:",
- IDC_STATIC,7,74,136,8
+ LTEXT "The error report contains these files:",IDC_STATIC,7,5,119,8
+ LTEXT "The selected file contains this information:",IDC_STATIC,7,74,136,8
RTEXT "Static",IDC_CRASHFILESIZE,329,74,55,8
- LISTBOX IDC_CRASHFILES,7,15,377,53,LBS_NOINTEGRALHEIGHT |
- WS_VSCROLL | WS_TABSTOP
- CONTROL "",IDC_CRASHFILECONTENTS,"RichEdit20A",ES_MULTILINE |
- ES_READONLY | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,83,
- 377,174
+ LISTBOX IDC_CRASHFILES,7,15,377,53,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ CONTROL "",IDC_CRASHFILECONTENTS,"RichEdit20A",ES_MULTILINE | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,83,377,174
END
IDD_BOING DIALOGEX 0, 0, 187, 196
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUP |
- WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Upload status"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
@@ -499,11 +423,8 @@ BEGIN
ICON IDI_BOING1,IDC_BOING,7,7,21,20
LTEXT "Static",IDC_BOINGSTATUS,33,12,147,8
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,166,189,1
- CONTROL "",IDC_BOINGEDIT,"RichEdit20A",ES_MULTILINE |
- ES_READONLY | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,34,
- 173,124
- CONTROL "",IDC_BOINGPROGRESS,"msctls_progress32",NOT WS_VISIBLE |
- WS_BORDER | 0x1,33,22,147,9
+ CONTROL "",IDC_BOINGEDIT,"RichEdit20A",ES_MULTILINE | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,34,173,124
+ CONTROL "",IDC_BOINGPROGRESS,"msctls_progress32",NOT WS_VISIBLE | WS_BORDER | 0x1,33,22,147,9
END
@@ -526,6 +447,11 @@ IDB_DEADGUY BITMAP "deadguy.bmp"
#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED