diff --git a/src/android/i_system.c b/src/android/i_system.c
index 150cbd505c1d40b40c1e5ac69bc911ec8eb849df..58fca7c1943448ff81ede9a67854f3791c93bc00 100644
--- a/src/android/i_system.c
+++ b/src/android/i_system.c
@@ -258,6 +258,18 @@ INT32 I_PutEnv(char *variable)
return -1;
}
+INT32 I_ClipboardCopy(const char *data, size_t size)
+{
+ (void)data;
+ (void)size;
+ return -1;
+}
+
+char *I_ClipboardPaste(void)
+{
+ return NULL;
+}
+
void I_RegisterSysCommands(void) {}
#include "../sdl/dosstr.c"
diff --git a/src/console.c b/src/console.c
index 025bc1c19f2068812cf14ade4740eaeeaa3587c7..70f8ab6f8db5923b4a81e5d7768510ff0e81137b 100644
--- a/src/console.c
+++ b/src/console.c
@@ -84,19 +84,23 @@ UINT32 con_scalefactor; // text size scale factor
// hold 32 last lines of input for history
#define CON_MAXPROMPTCHARS 256
-#define CON_PROMPTCHAR '>'
+#define CON_PROMPTCHAR '$'
static char inputlines[32][CON_MAXPROMPTCHARS]; // hold last 32 prompt lines
static INT32 inputline; // current input line number
static INT32 inputhist; // line number of history input line to restore
-static size_t input_cx; // position in current input line
+static size_t input_cur; // position of cursor in line
+static size_t input_sel; // position of selection marker (I.E.: anything between this and input_cur is "selected")
+static size_t input_len; // length of current line, used to bound cursor and such
+// notice: input does NOT include the "$" at the start of the line. - 11/3/16
// protos.
static void CON_InputInit(void);
static void CON_RecalcSize(void);
static void CONS_hudlines_Change(void);
+static void CONS_backcolor_Change(void);
static void CON_DrawBackpic(patch_t *pic, INT32 startx, INT32 destwidth);
//static void CON_DrawBackpic2(pic_t *pic, INT32 startx, INT32 destwidth);
@@ -129,10 +133,11 @@ static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"}
// whether to use console background picture, or translucent mode
static consvar_t cons_backpic = {"con_backpic", "translucent", CV_SAVE, backpic_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, {1, "Orange"},
- {2, "Blue"}, {3, "Green"}, {4, "Gray"},
- {5, "Red"}, {0, NULL}};
-consvar_t cons_backcolor = {"con_backcolor", "3", CV_SAVE, backcolor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, {1, "Gray"}, {2, "Brown"},
+ {3, "Red"}, {4, "Orange"}, {5, "Yellow"},
+ {6, "Green"}, {7, "Blue"}, {8, "Cyan"},
+ {0, NULL}};
+consvar_t cons_backcolor = {"con_backcolor", "Green", CV_CALL|CV_SAVE, backcolor_cons_t, CONS_backcolor_Change, 0, NULL, NULL, 0, 0, NULL};
static void CON_Print(char *msg);
@@ -219,8 +224,9 @@ static void CONS_Bind_f(void)
// CONSOLE SETUP
//======================================================================
-// Prepare a colormap for GREEN ONLY translucency over background
-//
+// Font colormap colors
+// TODO: This could probably be improved somehow...
+// These colormaps are 99% identical, with just a few changed bytes
UINT8 *yellowmap;
UINT8 *purplemap;
UINT8 *lgreenmap;
@@ -229,44 +235,49 @@ UINT8 *graymap;
UINT8 *redmap;
UINT8 *orangemap;
-// Console BG colors
-UINT8 *cwhitemap;
-UINT8 *corangemap;
-UINT8 *cbluemap;
-UINT8 *cgreenmap;
-UINT8 *cgraymap;
-UINT8 *credmap;
+// Console BG color
+UINT8 *consolebgmap = NULL;
-void CON_ReSetupBackColormap(UINT16 num)
+void CON_SetupBackColormap(void)
{
- UINT16 i, j;
- UINT8 k;
- UINT8 *pal = W_CacheLumpName(R_GetPalname(num), PU_CACHE);
+ UINT16 i, palsum;
+ UINT8 j, palindex;
+ UINT8 *pal = W_CacheLumpName(GetPalette(), PU_CACHE);
+
+ if (!consolebgmap)
+ consolebgmap = (UINT8 *)Z_Malloc(256, PU_STATIC, NULL);
+
+ switch (cons_backcolor.value)
+ {
+ case 0: palindex = 15; break; // White
+ case 1: palindex = 31; break; // Gray
+ case 2: palindex = 63; break; // Brown
+ case 3: palindex = 143; break; // Red
+ case 4: palindex = 95; break; // Orange
+ case 5: palindex = 111; break; // Yellow
+ case 6: palindex = 175; break; // Green
+ case 7: palindex = 239; break; // Blue
+ case 8: palindex = 219; break; // Cyan
+ // Default green
+ default: palindex = 175; break;
+}
- // setup the green translucent background colormaps
- for (i = 0, k = 0; i < 768; i += 3, k++)
+ // setup background colormap
+ for (i = 0, j = 0; i < 768; i += 3, j++)
{
- j = pal[i] + pal[i+1] + pal[i+2];
- cwhitemap[k] = (UINT8)(15 - (j>>6));
- corangemap[k] = (UINT8)(95 - (j>>6));
- cbluemap[k] = (UINT8)(239 - (j>>6));
- cgreenmap[k] = (UINT8)(175 - (j>>6));
- cgraymap[k] = (UINT8)(31 - (j>>6));
- credmap[k] = (UINT8)(143 - (j>>6));
+ palsum = (pal[i] + pal[i+1] + pal[i+2]) >> 6;
+ consolebgmap[j] = (UINT8)(palindex - palsum);
}
}
-static void CON_SetupBackColormap(void)
+static void CONS_backcolor_Change(void)
{
- INT32 i, j, k;
- UINT8 *pal;
+ CON_SetupBackColormap();
+}
- cwhitemap = (UINT8 *)Z_Malloc(256, PU_STATIC, NULL);
- corangemap = (UINT8 *)Z_Malloc(256, PU_STATIC, NULL);
- cbluemap = (UINT8 *)Z_Malloc(256, PU_STATIC, NULL);
- cgreenmap = (UINT8 *)Z_Malloc(256, PU_STATIC, NULL);
- cgraymap = (UINT8 *)Z_Malloc(256, PU_STATIC, NULL);
- credmap = (UINT8 *)Z_Malloc(256, PU_STATIC, NULL);
+static void CON_SetupColormaps(void)
+{
+ INT32 i;
yellowmap = (UINT8 *)Z_Malloc(256, PU_STATIC, NULL);
graymap = (UINT8 *)Z_Malloc(256, PU_STATIC, NULL);
@@ -276,20 +287,6 @@ static void CON_SetupBackColormap(void)
redmap = (UINT8 *)Z_Malloc(256, PU_STATIC, NULL);
orangemap = (UINT8 *)Z_Malloc(256, PU_STATIC, NULL);
- pal = W_CacheLumpName("PLAYPAL", PU_CACHE);
-
- // setup the green translucent background colormaps
- for (i = 0, k = 0; i < 768; i += 3, k++)
- {
- j = pal[i] + pal[i+1] + pal[i+2];
- cwhitemap[k] = (UINT8)(15 - (j>>6));
- corangemap[k] = (UINT8)(95 - (j>>6));
- cbluemap[k] = (UINT8)(239 - (j>>6));
- cgreenmap[k] = (UINT8)(175 - (j>>6));
- cgraymap[k] = (UINT8)(31 - (j>>6));
- credmap[k] = (UINT8)(143 - (j>>6));
- }
-
// setup the other colormaps, for console text
// these don't need to be aligned, unless you convert the
@@ -320,6 +317,9 @@ static void CON_SetupBackColormap(void)
redmap[9] = (UINT8)127;
orangemap[3] = (UINT8)85;
orangemap[9] = (UINT8)90;
+
+ // Init back colormap
+ CON_SetupBackColormap();
}
// Setup the console text buffer
@@ -343,7 +343,7 @@ void CON_Init(void)
con_width = 0;
CON_RecalcSize();
- CON_SetupBackColormap();
+ CON_SetupColormaps();
//note: CON_Ticker should always execute at least once before D_Display()
con_clipviewtop = -1; // -1 does not clip
@@ -386,14 +386,10 @@ void CON_Init(void)
//
static void CON_InputInit(void)
{
- INT32 i;
-
// prepare the first prompt line
memset(inputlines, 0, sizeof (inputlines));
- for (i = 0; i < 32; i++)
- inputlines[i][0] = CON_PROMPTCHAR;
inputline = 0;
- input_cx = 1;
+ input_cur = input_sel = input_len = 0;
}
//======================================================================
@@ -618,13 +614,91 @@ void CON_Ticker(void)
}
}
+//
+// ----
+//
+// Shortcuts for adding and deleting characters, strings, and sections
+// Necessary due to moving cursor
+//
+
+static void CON_InputClear(void)
+{
+ memset(inputlines[inputline], 0, CON_MAXPROMPTCHARS);
+ input_cur = input_sel = input_len = 0;
+}
+
+static void CON_InputSetString(const char *c)
+{
+ memset(inputlines[inputline], 0, CON_MAXPROMPTCHARS);
+ strcpy(inputlines[inputline], c);
+ input_cur = input_sel = input_len = strlen(c);
+}
+
+static void CON_InputAddString(const char *c)
+{
+ size_t csize = strlen(c);
+ if (input_len + csize > CON_MAXPROMPTCHARS-1)
+ return;
+ if (input_cur != input_len)
+ memmove(&inputlines[inputline][input_cur+csize], &inputlines[inputline][input_cur], input_len-input_cur);
+ memcpy(&inputlines[inputline][input_cur], c, csize);
+ input_len += csize;
+ input_sel = (input_cur += csize);
+}
+
+static void CON_InputDelSelection(void)
+{
+ size_t start, end, len;
+ if (input_cur > input_sel)
+ {
+ start = input_sel;
+ end = input_cur;
+ }
+ else
+ {
+ start = input_cur;
+ end = input_sel;
+ }
+ len = (end - start);
+
+ if (end != input_len)
+ memmove(&inputlines[inputline][start], &inputlines[inputline][end], input_len-end);
+ memset(&inputlines[inputline][input_len - len], 0, len);
+
+ input_len -= len;
+ input_sel = input_cur = start;
+}
+
+static void CON_InputAddChar(char c)
+{
+ if (input_len >= CON_MAXPROMPTCHARS-1)
+ return;
+ if (input_cur != input_len)
+ memmove(&inputlines[inputline][input_cur+1], &inputlines[inputline][input_cur], input_len-input_cur);
+ inputlines[inputline][input_cur++] = c;
+ inputlines[inputline][++input_len] = 0;
+ input_sel = input_cur;
+}
+
+static void CON_InputDelChar(void)
+{
+ if (!input_cur)
+ return;
+ if (input_cur != input_len)
+ memmove(&inputlines[inputline][input_cur-1], &inputlines[inputline][input_cur], input_len-input_cur);
+ inputlines[inputline][--input_len] = 0;
+ input_sel = --input_cur;
+}
+
+//
+// ----
+//
+
// Handles console key input
//
boolean CON_Responder(event_t *ev)
{
- static boolean consdown;
- static boolean shiftdown;
- static boolean ctrldown;
+ static UINT8 consdown = false; // console is treated differently due to rare usage
// sequential completions a la 4dos
static char completion[80];
@@ -639,13 +713,8 @@ boolean CON_Responder(event_t *ev)
// let go keyup events, don't eat them
if (ev->type != ev_keydown && ev->type != ev_console)
{
- if (ev->data1 == KEY_LSHIFT || ev->data1 == KEY_RSHIFT)
- shiftdown = false;
- else if (ev->data1 == KEY_LCTRL || ev->data1 == KEY_RCTRL)
- ctrldown = false;
- else if (ev->data1 == gamecontrol[gc_console][0] || ev->data1 == gamecontrol[gc_console][1])
+ if (ev->data1 == gamecontrol[gc_console][0] || ev->data1 == gamecontrol[gc_console][1])
consdown = false;
-
return false;
}
@@ -684,94 +753,110 @@ boolean CON_Responder(event_t *ev)
consoletoggle = true;
return true;
}
-
- }
-
- // eat shift only if console active
- if (key == KEY_LSHIFT || key == KEY_RSHIFT)
- {
- shiftdown = true;
- return true;
}
- // same for ctrl
- if (key == KEY_LCTRL || key == KEY_RCTRL)
- {
- ctrldown = true;
+ // Always eat ctrl/shift/alt if console open, so the menu doesn't get ideas
+ if (key == KEY_LSHIFT || key == KEY_RSHIFT
+ || key == KEY_LCTRL || key == KEY_RCTRL
+ || key == KEY_LALT || key == KEY_RALT)
return true;
- }
- // command completion forward (tab) and backward (shift-tab)
- if (key == KEY_TAB)
+ // ctrl modifier -- changes behavior, adds shortcuts
+ if (ctrldown)
{
// show all cvars/commands that match what we have inputted
- if (ctrldown)
+ if (key == KEY_TAB)
{
- UINT32 i;
- size_t stop = input_cx - 1;
- char nameremainder[255];
+ size_t i, len;
- if (input_cx < 2 || strlen(inputlines[inputline]+1) >= 80)
- return true;
-
- strcpy(completion, inputlines[inputline]+1);
-
- // trimming: stop at the first newline
- for (i = 0; i < input_cx - 1; ++i)
+ if (!completion[0])
{
- if (completion[i] == ' ')
- {
- completion[i] = '\0';
- stop = i;
- break;
- }
+ if (!input_len || input_len >= 40 || strchr(inputlines[inputline], ' '))
+ return true;
+ strcpy(completion, inputlines[inputline]);
+ comskips = varskips = 0;
}
-
- i = 0;
+ len = strlen(completion);
//first check commands
CONS_Printf("\nCommands:\n");
-
- for (cmd = COM_CompleteCommand(completion, i); cmd; cmd = COM_CompleteCommand(completion, i))
- {
- strncpy(nameremainder, cmd+(stop), strlen(cmd)-(stop));
- nameremainder[strlen(cmd)-(stop)] = '\0';
-
- CONS_Printf(" \x83" "%s" "\x80" "%s\n", completion, nameremainder);
- ++i;
- }
- if (i == 0)
- CONS_Printf(" (none)\n");
-
- i = 0;
+ for (i = 0, cmd = COM_CompleteCommand(completion, i); cmd; cmd = COM_CompleteCommand(completion, ++i))
+ CONS_Printf(" \x83" "%s" "\x80" "%s\n", completion, cmd+len);
+ if (i == 0) CONS_Printf(" (none)\n");
//now we move on to CVARs
CONS_Printf("Variables:\n");
+ for (i = 0, cmd = CV_CompleteVar(completion, i); cmd; cmd = CV_CompleteVar(completion, ++i))
+ CONS_Printf(" \x83" "%s" "\x80" "%s\n", completion, cmd+len);
+ if (i == 0) CONS_Printf(" (none)\n");
- for (cmd = CV_CompleteVar(completion, i); cmd; cmd = CV_CompleteVar(completion, i))
- {
- strncpy(nameremainder, cmd+(stop), strlen(cmd)-(stop));
- nameremainder[strlen(cmd)-(stop)] = '\0';
+ return true;
+ }
+ // ---
- CONS_Printf(" \x83" "%s" "\x80" "%s\n", completion, nameremainder);
- ++i;
- }
- if (i == 0)
- CONS_Printf(" (none)\n");
+ if (key == KEY_HOME) // oldest text in buffer
+ {
+ con_scrollup = (con_totallines-((con_curlines-16)>>3));
+ return true;
+ }
+ else if (key == KEY_END) // most recent text in buffer
+ {
+ con_scrollup = 0;
+ return true;
+ }
+ if (key == 'x' || key == 'X')
+ {
+ if (input_sel > input_cur)
+ I_ClipboardCopy(&inputlines[inputline][input_cur], input_sel-input_cur);
+ else
+ I_ClipboardCopy(&inputlines[inputline][input_sel], input_cur-input_sel);
+ CON_InputDelSelection();
+ completion[0] = 0;
+ return true;
+ }
+ else if (key == 'c' || key == 'C')
+ {
+ if (input_sel > input_cur)
+ I_ClipboardCopy(&inputlines[inputline][input_cur], input_sel-input_cur);
+ else
+ I_ClipboardCopy(&inputlines[inputline][input_sel], input_cur-input_sel);
+ return true;
+ }
+ else if (key == 'v' || key == 'V')
+ {
+ const char *paste = I_ClipboardPaste();
+ if (input_sel != input_cur)
+ CON_InputDelSelection();
+ if (paste != NULL)
+ CON_InputAddString(paste);
+ completion[0] = 0;
return true;
}
+ // Select all
+ if (key == 'a' || key == 'A')
+ {
+ input_sel = 0;
+ input_cur = input_len;
+ return true;
+ }
+
+ // don't eat the key
+ return false;
+ }
+
+ // command completion forward (tab) and backward (shift-tab)
+ if (key == KEY_TAB)
+ {
// sequential command completion forward and backward
// remember typing for several completions (a-la-4dos)
- if (inputlines[inputline][input_cx-1] != ' ')
+ if (!completion[0])
{
- if (strlen(inputlines[inputline]+1) < 80)
- strcpy(completion, inputlines[inputline]+1);
- else
- completion[0] = 0;
-
+ if (!input_len || input_len >= 40 || strchr(inputlines[inputline], ' '))
+ return true;
+ strcpy(completion, inputlines[inputline]);
comskips = varskips = 0;
}
else
@@ -783,37 +868,26 @@ boolean CON_Responder(event_t *ev)
if (--varskips < 0)
comskips = -comskips - 2;
}
- else if (comskips > 0)
- comskips--;
+ else if (comskips > 0) comskips--;
}
else
{
- if (comskips < 0)
- varskips++;
- else
- comskips++;
+ if (comskips < 0) varskips++;
+ else comskips++;
}
}
if (comskips >= 0)
{
cmd = COM_CompleteCommand(completion, comskips);
- if (!cmd)
- // dirty: make sure if comskips is zero, to have a neg value
+ if (!cmd) // dirty: make sure if comskips is zero, to have a neg value
comskips = -comskips - 1;
}
if (comskips < 0)
cmd = CV_CompleteVar(completion, varskips);
if (cmd)
- {
- memset(inputlines[inputline]+1, 0, CON_MAXPROMPTCHARS-1);
- strcpy(inputlines[inputline]+1, cmd);
- input_cx = strlen(cmd) + 1;
- inputlines[inputline][input_cx] = ' ';
- input_cx++;
- inputlines[inputline][input_cx] = 0;
- }
+ CON_InputSetString(va("%s ", cmd));
else
{
if (comskips > 0)
@@ -839,47 +913,80 @@ boolean CON_Responder(event_t *ev)
return true;
}
- if (key == KEY_HOME) // oldest text in buffer
+ if (key == KEY_LEFTARROW)
+ {
+ if (input_cur != 0)
+ --input_cur;
+ if (!shiftdown)
+ input_sel = input_cur;
+ return true;
+ }
+ else if (key == KEY_RIGHTARROW)
+ {
+ if (input_cur < input_len)
+ ++input_cur;
+ if (!shiftdown)
+ input_sel = input_cur;
+ return true;
+ }
+ else if (key == KEY_HOME)
{
- con_scrollup = (con_totallines-((con_curlines-16)>>3));
+ input_cur = 0;
+ if (!shiftdown)
+ input_sel = input_cur;
return true;
}
- else if (key == KEY_END) // most recent text in buffer
+ else if (key == KEY_END)
{
- con_scrollup = 0;
+ input_cur = input_len;
+ if (!shiftdown)
+ input_sel = input_cur;
return true;
}
+ // At this point we're messing with input
+ // Clear completion
+ completion[0] = 0;
+
// command enter
if (key == KEY_ENTER)
{
- if (input_cx < 2)
+ if (!input_len)
return true;
// push the command
- COM_BufAddText(inputlines[inputline]+1);
+ COM_BufAddText(inputlines[inputline]);
COM_BufAddText("\n");
- CONS_Printf("%s\n", inputlines[inputline]);
+ CONS_Printf("\x86""%c""\x80""%s\n", CON_PROMPTCHAR, inputlines[inputline]);
inputline = (inputline+1) & 31;
inputhist = inputline;
-
- memset(inputlines[inputline], 0, CON_MAXPROMPTCHARS);
- inputlines[inputline][0] = CON_PROMPTCHAR;
- input_cx = 1;
+ CON_InputClear();
return true;
}
- // backspace command prompt
- if (key == KEY_BACKSPACE)
+ // backspace and delete command prompt
+ if (input_sel != input_cur)
{
- if (input_cx > 1)
+ if (key == KEY_BACKSPACE || key == KEY_DEL)
{
- input_cx--;
- inputlines[inputline][input_cx] = 0;
+ CON_InputDelSelection();
+ return true;
}
+ }
+ else if (key == KEY_BACKSPACE)
+ {
+ CON_InputDelChar();
+ return true;
+ }
+ else if (key == KEY_DEL)
+ {
+ if (input_cur == input_len)
+ return true;
+ ++input_cur;
+ CON_InputDelChar();
return true;
}
@@ -888,18 +995,15 @@ boolean CON_Responder(event_t *ev)
{
// copy one of the previous inputlines to the current
do
- {
inputhist = (inputhist - 1) & 31; // cycle back
- } while (inputhist != inputline && !inputlines[inputhist][1]);
+ while (inputhist != inputline && !inputlines[inputhist][0]);
// stop at the last history input line, which is the
// current line + 1 because we cycle through the 32 input lines
if (inputhist == inputline)
inputhist = (inputline + 1) & 31;
- M_Memcpy(inputlines[inputline], inputlines[inputhist], CON_MAXPROMPTCHARS);
- input_cx = strlen(inputlines[inputline]);
-
+ CON_InputSetString(inputlines[inputhist]);
return true;
}
@@ -909,23 +1013,14 @@ boolean CON_Responder(event_t *ev)
if (inputhist == inputline)
return true;
do
- {
inputhist = (inputhist + 1) & 31;
- } while (inputhist != inputline && !inputlines[inputhist][1]);
-
- memset(inputlines[inputline], 0, CON_MAXPROMPTCHARS);
+ while (inputhist != inputline && !inputlines[inputhist][0]);
// back to currentline
if (inputhist == inputline)
- {
- inputlines[inputline][0] = CON_PROMPTCHAR;
- input_cx = 1;
- }
+ CON_InputClear();
else
- {
- strcpy(inputlines[inputline], inputlines[inputhist]);
- input_cx = strlen(inputlines[inputline]);
- }
+ CON_InputSetString(inputlines[inputhist]);
return true;
}
@@ -950,15 +1045,12 @@ boolean CON_Responder(event_t *ev)
return false;
// add key to cmd line here
- if (input_cx < CON_MAXPROMPTCHARS)
- {
- if (key >= 'A' && key <= 'Z' && !shiftdown) //this is only really necessary for dedicated servers
- key = key + 'a' - 'A';
+ if (key >= 'A' && key <= 'Z' && !shiftdown) //this is only really necessary for dedicated servers
+ key = key + 'a' - 'A';
- inputlines[inputline][input_cx] = (char)key;
- inputlines[inputline][input_cx + 1] = 0;
- input_cx++;
- }
+ if (input_sel != input_cur)
+ CON_InputDelSelection();
+ CON_InputAddChar(key);
return true;
}
@@ -1242,26 +1334,89 @@ void CONS_Error(const char *msg)
//
static void CON_DrawInput(void)
{
- char *p;
- size_t c;
- INT32 x, y;
INT32 charwidth = (INT32)con_scalefactor << 3;
-
- // input line scrolls left if it gets too long
- p = inputlines[inputline];
- if (input_cx >= con_width-11)
- p += input_cx - (con_width-11) + 1;
+ const char *p = inputlines[inputline];
+ size_t c, clen, cend;
+ UINT8 lellip = 0, rellip = 0;
+ INT32 x, y, i;
y = con_curlines - 12 * con_scalefactor;
+ x = charwidth*2;
- for (c = 0, x = charwidth; c < con_width-11; c++, x += charwidth)
- V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+ clen = con_width-13;
- // draw the blinking cursor
- //
- x = ((input_cx >= con_width-11) ? (INT32)(con_width-11) : (INT32)((input_cx + 1)) * charwidth);
- if (con_tick < 4)
- V_DrawCharacter(x, y, '_' | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+ if (input_len <= clen)
+ {
+ c = 0;
+ clen = input_len;
+ }
+ else // input line scrolls left if it gets too long
+ {
+ clen -= 2; // There will always be some extra truncation -- but where is what we'll find out
+
+ if (input_cur <= clen/2)
+ {
+ // Close enough to right edge to show all
+ c = 0;
+ // Always will truncate right side from this position, so always draw right ellipsis
+ rellip = 1;
+ }
+ else
+ {
+ // Cursor in the middle (or right side) of input
+ // Move over for the ellipsis
+ c = input_cur - (clen/2) + 2;
+ x += charwidth*2;
+ lellip = 1;
+
+ if (c + clen >= input_len)
+ {
+ // Cursor in the right side of input
+ // We were too far over, so move back
+ c = input_len - clen;
+ }
+ else
+ {
+ // Cursor in the middle -- ellipses on both sides
+ clen -= 2;
+ rellip = 1;
+ }
+ }
+ }
+
+ if (lellip)
+ {
+ x -= charwidth*3;
+ if (input_sel < c)
+ V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 107 | V_NOSCALESTART);
+ for (i = 0; i < 3; ++i, x += charwidth)
+ V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value);
+ }
+ else
+ V_DrawCharacter(x-charwidth, y, CON_PROMPTCHAR | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value);
+
+ for (cend = c + clen; c < cend; ++c, x += charwidth)
+ {
+ if ((input_sel > c && input_cur <= c) || (input_sel <= c && input_cur > c))
+ {
+ V_DrawFill(x, y, charwidth, (10 * con_scalefactor), 107 | V_NOSCALESTART);
+ V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_YELLOWMAP | V_NOSCALESTART, !cv_allcaps.value);
+ }
+ else
+ V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+
+ if (c == input_cur && con_tick >= 4)
+ V_DrawCharacter(x, y + (con_scalefactor*2), '_' | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+ }
+ if (cend == input_cur && con_tick >= 4)
+ V_DrawCharacter(x, y + (con_scalefactor*2), '_' | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
+ if (rellip)
+ {
+ if (input_sel > cend)
+ V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 107 | V_NOSCALESTART);
+ for (i = 0; i < 3; ++i, x += charwidth)
+ V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value);
+ }
}
// draw the last lines of console text to the top of the screen
@@ -1417,7 +1572,7 @@ static void CON_DrawConsole(void)
{
// inu: no more width (was always 0 and vid.width)
if (rendermode != render_none)
- V_DrawFadeConsBack(con_curlines, cons_backcolor.value); // translucent background
+ V_DrawFadeConsBack(con_curlines); // translucent background
}
// draw console text lines from top to bottom
diff --git a/src/console.h b/src/console.h
index 47af65e21226319cd051712efdc329677b91fbea..8cf6483ff697914cff53b85ef7dbac5d0717c2c6 100644
--- a/src/console.h
+++ b/src/console.h
@@ -40,11 +40,10 @@ extern consvar_t cons_backcolor;
extern UINT8 *yellowmap, *purplemap, *lgreenmap, *bluemap, *graymap, *redmap, *orangemap;
-// Console bg colors:
-extern UINT8 *cwhitemap, *corangemap, *cbluemap, *cgreenmap, *cgraymap,
- *credmap;
+// Console bg color (auto updated to match)
+extern UINT8 *consolebgmap;
-void CON_ReSetupBackColormap(UINT16 num);
+void CON_SetupBackColormap(void);
void CON_ClearHUD(void); // clear heads up messages
void CON_Ticker(void);
diff --git a/src/d_main.c b/src/d_main.c
index b61ec41435f08f991d1d5bcaf82f0bbfadb2a620..2caf50087407c4f60ac8f6e1d0ee2ef2c2176e27 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -73,6 +73,7 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
#include "dehacked.h" // Dehacked list test
#include "m_cond.h" // condition initialization
#include "fastcmp.h"
+#include "keys.h"
#ifdef CMAKECONFIG
#include "config.h"
@@ -176,6 +177,38 @@ void D_PostEvent(const event_t *ev)
void D_PostEvent_end(void) {};
#endif
+// modifier keys
+UINT8 shiftdown = 0; // 0x1 left, 0x2 right
+UINT8 ctrldown = 0; // 0x1 left, 0x2 right
+UINT8 altdown = 0; // 0x1 left, 0x2 right
+//
+// D_ModifierKeyResponder
+// Sets global shift/ctrl/alt variables, never actually eats events
+//
+static inline void D_ModifierKeyResponder(event_t *ev)
+{
+ if (ev->type == ev_keydown) switch (ev->data1)
+ {
+ case KEY_LSHIFT: shiftdown |= 0x1; return;
+ case KEY_RSHIFT: shiftdown |= 0x2; return;
+ case KEY_LCTRL: ctrldown |= 0x1; return;
+ case KEY_RCTRL: ctrldown |= 0x2; return;
+ case KEY_LALT: altdown |= 0x1; return;
+ case KEY_RALT: altdown |= 0x2; return;
+ default: return;
+ }
+ else if (ev->type == ev_keyup) switch (ev->data1)
+ {
+ case KEY_LSHIFT: shiftdown &= ~0x1; return;
+ case KEY_RSHIFT: shiftdown &= ~0x2; return;
+ case KEY_LCTRL: ctrldown &= ~0x1; return;
+ case KEY_RCTRL: ctrldown &= ~0x2; return;
+ case KEY_LALT: altdown &= ~0x1; return;
+ case KEY_RALT: altdown &= ~0x2; return;
+ default: return;
+ }
+}
+
//
// D_ProcessEvents
// Send all the events of the given timestamp down the responder chain
@@ -188,6 +221,9 @@ void D_ProcessEvents(void)
{
ev = &events[eventtail];
+ // Set global shift/ctrl/alt down variables
+ D_ModifierKeyResponder(ev); // never eats events
+
// Screenshots over everything so that they can be taken anywhere.
if (M_ScreenshotResponder(ev))
continue; // ate the event
diff --git a/src/djgppdos/i_system.c b/src/djgppdos/i_system.c
index 854d68f4d5b98ac3e145468ef3eaac4949af69a6..dae9ed16e3b426d195bf91c8ee62890fc42d7f48 100644
--- a/src/djgppdos/i_system.c
+++ b/src/djgppdos/i_system.c
@@ -1721,6 +1721,18 @@ INT32 I_PutEnv(char *variable)
return putenv(variable);
}
+INT32 I_ClipboardCopy(const char *data, size_t size)
+{
+ (void)data;
+ (void)size;
+ return -1;
+}
+
+char *I_ClipboardPaste(void)
+{
+ return NULL;
+}
+
const CPUInfoFlags *I_CPUInfo(void)
{
static CPUInfoFlags DOS_CPUInfo;
diff --git a/src/doomdef.h b/src/doomdef.h
index fb8ab1ca270aa10d6adc856665f79f762ccfa79c..4b2d8c737b8dcc703c971ef122c4b9fdeb4740c8 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -394,6 +394,9 @@ extern INT32 cv_debug;
// Misc stuff for later...
// =======================
+// Modifier key variables, accessible anywhere
+extern UINT8 shiftdown, ctrldown, altdown;
+
// if we ever make our alloc stuff...
#define ZZ_Alloc(x) Z_Malloc(x, PU_STATIC, NULL)
diff --git a/src/dummy/i_system.c b/src/dummy/i_system.c
index c1e48b60bb0239de595447dc9999ecb4ec949073..a3fe3077c2a46f6956a5723eb1de40127da7e798 100644
--- a/src/dummy/i_system.c
+++ b/src/dummy/i_system.c
@@ -162,6 +162,18 @@ INT32 I_PutEnv(char *variable)
return -1;
}
+INT32 I_ClipboardCopy(const char *data, size_t size)
+{
+ (void)data;
+ (void)size;
+ return -1;
+}
+
+char *I_ClipboardPaste(void)
+{
+ return NULL;
+}
+
void I_RegisterSysCommands(void) {}
#include "../sdl/dosstr.c"
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 5251e0b301d21001ed1f30846f831a38f958a23f..a107ecd35efefa2b5510988c5b62214577bf6b50 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -45,7 +45,7 @@
#include "hw_md2.h"
#define R_FAKEFLOORS
-//#define HWPRECIP
+#define HWPRECIP
#define SORTING
//#define POLYSKY
@@ -4401,7 +4401,6 @@ static inline void HWR_DrawPrecipitationSprite(gr_vissprite_t *spr)
FOutVector *wv;
GLPatch_t *gpatch; // sprite patch converted to hardware
FSurfaceInfo Surf;
- sector_t *sector;
if (!spr->mobj)
return;
@@ -4455,19 +4454,38 @@ static inline void HWR_DrawPrecipitationSprite(gr_vissprite_t *spr)
//Hurdler: 25/04/2000: now support colormap in hardware mode
HWR_GetMappedPatch(gpatch, spr->colormap);
- sector = spr->mobj->subsector->sector;
-
- if (sector->ffloors)
+ // colormap test
{
- ffloor_t *caster = sector->lightlist[R_GetPlaneLight(sector, spr->mobj->z, false)].caster;
- sector = caster ? §ors[caster->secnum] : sector;
- }
+ sector_t *sector = spr->mobj->subsector->sector;
+ UINT8 lightlevel = 255;
+ extracolormap_t *colormap = sector->extra_colormap;
- // sprite lighting by modulating the RGB components
- if (sector->extra_colormap)
- Surf.FlatColor.rgba = HWR_Lighting(spr->sectorlight,sector->extra_colormap->rgba,sector->extra_colormap->fadergba, false, false);
+ if (sector->numlights)
+ {
+ INT32 light;
+
+ light = R_GetPlaneLight(sector, spr->mobj->z + spr->mobj->height, false); // Always use the light at the top instead of whatever I was doing before
+
+ if (!(spr->mobj->frame & FF_FULLBRIGHT))
+ lightlevel = *sector->lightlist[light].lightlevel;
+
+ if (sector->lightlist[light].extra_colormap)
+ colormap = sector->lightlist[light].extra_colormap;
+ }
else
- Surf.FlatColor.rgba = HWR_Lighting(spr->sectorlight,NORMALFOG,FADEFOG, false, false);
+ {
+ if (!(spr->mobj->frame & FF_FULLBRIGHT))
+ lightlevel = sector->lightlevel;
+
+ if (sector->extra_colormap)
+ colormap = sector->extra_colormap;
+ }
+
+ if (colormap)
+ Surf.FlatColor.rgba = HWR_Lighting(lightlevel, colormap->rgba, colormap->fadergba, false, false);
+ else
+ Surf.FlatColor.rgba = HWR_Lighting(lightlevel, NORMALFOG, FADEFOG, false, false);
+ }
if (spr->mobj->flags2 & MF2_SHADOW)
{
@@ -5289,6 +5307,11 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
//
vis = HWR_NewVisSprite();
vis->x1 = x1;
+#if 0
+ vis->x2 = x2;
+#else
+ (void)x2;
+#endif
vis->x2 = tx;
vis->tz = tz;
vis->dispoffset = 0; // Monster Iestyn: 23/11/15: HARDWARE SUPPORT AT LAST
@@ -5301,7 +5324,6 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
// set top/bottom coords
vis->ty = FIXED_TO_FLOAT(thing->z + spritecachedinfo[lumpoff].topoffset) - gr_viewz;
- vis->sectorlight = 0xff;
vis->precip = true;
}
#endif
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 8e48ec110388c6f3082b7a0b928a7b83c58af81b..4ec2e346a54b227f806ecf210e84085cc16e1a4e 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -308,6 +308,23 @@ static md2_model_t *md2_readModel(const char *filename)
model->header.numSkins = 1;
+#define MD2LIMITCHECK(field, max, msgname) \
+ if (field > max) \
+ { \
+ CONS_Alert(CONS_ERROR, "md2_readModel: %s has too many " msgname " (# found: %d, maximum: %d)\n", filename, field, max); \
+ md2_freeModel (model); \
+ return 0; \
+ }
+
+ // Uncomment if these are actually needed
+// MD2LIMITCHECK(model->header.numSkins, MD2_MAX_SKINS, "skins")
+// MD2LIMITCHECK(model->header.numTexCoords, MD2_MAX_TEXCOORDS, "texture coordinates")
+ MD2LIMITCHECK(model->header.numTriangles, MD2_MAX_TRIANGLES, "triangles")
+ MD2LIMITCHECK(model->header.numFrames, MD2_MAX_FRAMES, "frames")
+ MD2LIMITCHECK(model->header.numVertices, MD2_MAX_VERTICES, "vertices")
+
+#undef MD2LIMITCHECK
+
// read skins
fseek(file, model->header.offsetSkins, SEEK_SET);
if (model->header.numSkins > 0)
@@ -319,8 +336,6 @@ static md2_model_t *md2_readModel(const char *filename)
md2_freeModel (model);
return 0;
}
-
- ;
}
// read texture coordinates
@@ -334,8 +349,6 @@ static md2_model_t *md2_readModel(const char *filename)
md2_freeModel (model);
return 0;
}
-
-
}
// read triangles
@@ -769,6 +782,7 @@ void HWR_InitMD2(void)
md2_playermodels[s].grpatch = NULL;
md2_playermodels[s].skin = -1;
md2_playermodels[s].notfound = true;
+ md2_playermodels[s].error = false;
}
for (i = 0; i < NUMSPRITES; i++)
{
@@ -777,6 +791,7 @@ void HWR_InitMD2(void)
md2_models[i].grpatch = NULL;
md2_models[i].skin = -1;
md2_models[i].notfound = true;
+ md2_models[i].error = false;
}
// read the md2.dat file
@@ -1269,6 +1284,8 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
else
md2 = &md2_models[spr->mobj->sprite];
+ if (md2->error)
+ return; // we already failed loading this before :(
if (!md2->model)
{
//CONS_Debug(DBG_RENDER, "Loading MD2... (%s)", sprnames[spr->mobj->sprite]);
@@ -1282,6 +1299,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
else
{
//CONS_Debug(DBG_RENDER, " FAILED\n");
+ md2->error = true; // prevent endless fail
return;
}
}
diff --git a/src/hardware/hw_md2.h b/src/hardware/hw_md2.h
index 36078268b50d590114e5025833b0197b0c3a0b19..5a7e6d2b3cdaf0c3ae7d5813e835d5cf8711403e 100644
--- a/src/hardware/hw_md2.h
+++ b/src/hardware/hw_md2.h
@@ -123,6 +123,7 @@ typedef struct
void *blendgrpatch;
boolean notfound;
INT32 skin;
+ boolean error;
} md2_t;
extern md2_t md2_models[NUMSPRITES];
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index ec747305ea5b1cac5201ef425bd0d2f520b8c0c0..e33a54305aec62471e1311337c7e52ddab704a33 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -757,15 +757,8 @@ void HU_clearChatChars(void)
//
boolean HU_Responder(event_t *ev)
{
- static boolean shiftdown = false;
UINT8 c;
- if (ev->data1 == KEY_LSHIFT || ev->data1 == KEY_RSHIFT)
- {
- shiftdown = (ev->type == ev_keydown);
- return chat_on;
- }
-
if (ev->type != ev_keydown)
return false;
diff --git a/src/i_system.h b/src/i_system.h
index c161851e05ce93c6c460da4575f1c14f8dc5bbc4..d61f2d16e7730c8516b556d3d1f9705e5fb565fc 100644
--- a/src/i_system.h
+++ b/src/i_system.h
@@ -296,6 +296,14 @@ char *I_GetEnv(const char *name);
INT32 I_PutEnv(char *variable);
+/** \brief Put data in system clipboard
+*/
+INT32 I_ClipboardCopy(const char *data, size_t size);
+
+/** \brief Retrieve data from system clipboard
+*/
+const char *I_ClipboardPaste(void);
+
void I_RegisterSysCommands(void);
#endif
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index 7aadd9c0e871f9297d64bf1385637eb81a45be5b..60cbbe5018f28fb657cee6ec608d275386b53411 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -369,6 +369,8 @@ static int libd_drawScaled(lua_State *L)
x = luaL_checkinteger(L, 1);
y = luaL_checkinteger(L, 2);
scale = luaL_checkinteger(L, 3);
+ if (scale < 0)
+ return luaL_error(L, "negative scale");
patch = *((patch_t **)luaL_checkudata(L, 4, META_PATCH));
flags = luaL_optinteger(L, 5, 0);
if (!lua_isnoneornil(L, 6))
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 89334596ec777599c89a005472764c3a1dedbab0..3bbaadc5b05f4e48273b7267b0b44523becf1af8 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -452,7 +452,7 @@ void Command_RTeleport_f(void)
else
inty = 0;
- ss = R_PointInSubsector(p->mo->x + intx*FRACUNIT, p->mo->y + inty*FRACUNIT);
+ ss = R_IsPointInSubsector(p->mo->x + intx*FRACUNIT, p->mo->y + inty*FRACUNIT);
if (!ss || ss->sector->ceilingheight - ss->sector->floorheight < p->mo->height)
{
CONS_Alert(CONS_NOTICE, M_GetText("Not a valid location.\n"));
diff --git a/src/m_menu.c b/src/m_menu.c
index 78c3812730669acde16add9452c143c3c74bc0e1..d7b4d9080ebf130f1be06b642f11eed905da97e5 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -182,9 +182,6 @@ static INT32 vidm_selected = 0;
static INT32 vidm_nummodes;
static INT32 vidm_column_size;
-// what a headache.
-static boolean shiftdown = false;
-
//
// PROTOTYPES
//
@@ -2080,11 +2077,6 @@ boolean M_Responder(event_t *ev)
|| gamestate == GS_CREDITS || gamestate == GS_EVALUATION)
return false;
- if (ev->type == ev_keyup && (ev->data1 == KEY_LSHIFT || ev->data1 == KEY_RSHIFT))
- {
- shiftdown = false;
- return false;
- }
if (noFurtherInput)
{
// Ignore input after enter/escape/other buttons
@@ -2098,10 +2090,6 @@ boolean M_Responder(event_t *ev)
// added 5-2-98 remap virtual keys (mouse & joystick buttons)
switch (ch)
{
- case KEY_LSHIFT:
- case KEY_RSHIFT:
- shiftdown = true;
- break; //return false;
case KEY_MOUSE1:
case KEY_JOY1:
case KEY_JOY1 + 2:
diff --git a/src/nds/i_system.c b/src/nds/i_system.c
index 0ed58029c194c12ce43c977c54b4cc0a18250b58..3e5c4b8c6d33fb6d266d12aad24e3d50748a9769 100644
--- a/src/nds/i_system.c
+++ b/src/nds/i_system.c
@@ -269,6 +269,18 @@ INT32 I_PutEnv(char *variable)
return -1;
}
+INT32 I_ClipboardCopy(const char *data, size_t size)
+{
+ (void)data;
+ (void)size;
+ return -1;
+}
+
+char *I_ClipboardPaste(void)
+{
+ return NULL;
+}
+
void I_RegisterSysCommands(void) {}
#include "../sdl/dosstr.c"
diff --git a/src/p_map.c b/src/p_map.c
index c4616db489601cc6584c0b0ec0dd8239bf9d2b1a..6a555953e23ad5420704e2ffddaf8b2dde2678df 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -985,18 +985,24 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true;
}
- topz = thing->z - FixedMul(FRACUNIT, thing->scale);
+ topz = thing->z - thing->scale; // FixedMul(FRACUNIT, thing->scale), but thing->scale == FRACUNIT in base scale anyways
// block only when jumping not high enough,
// (dont climb max. 24units while already in air)
- // if not in air, let P_TryMove() decide if it's not too high
+ // since return false doesn't handle momentum properly,
+ // we lie to P_TryMove() so it's always too high
if (tmthing->player && tmthing->z + tmthing->height > topz
&& tmthing->z + tmthing->height < tmthing->ceilingz)
- return false; // block while in air
-
- if (thing->flags & MF_SPRING)
+ {
+ tmfloorz = tmceilingz = INT32_MIN; // block while in air
+#ifdef ESLOPE
+ tmceilingslope = NULL;
+#endif
+ tmfloorthing = thing; // needed for side collision
+ }
+ else if (thing->flags & MF_SPRING)
;
- else if (topz < tmceilingz && tmthing->z+tmthing->height <= thing->z+thing->height)
+ else if (topz < tmceilingz && tmthing->z <= thing->z+thing->height)
{
tmceilingz = topz;
#ifdef ESLOPE
@@ -1022,17 +1028,24 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true;
}
- topz = thing->z + thing->height + FixedMul(FRACUNIT, thing->scale);
+ topz = thing->z + thing->height + thing->scale; // FixedMul(FRACUNIT, thing->scale), but thing->scale == FRACUNIT in base scale anyways
// block only when jumping not high enough,
// (dont climb max. 24units while already in air)
- // if not in air, let P_TryMove() decide if it's not too high
- if (tmthing->player && tmthing->z < topz && tmthing->z > tmthing->floorz)
- return false; // block while in air
-
- if (thing->flags & MF_SPRING)
+ // since return false doesn't handle momentum properly,
+ // we lie to P_TryMove() so it's always too high
+ if (tmthing->player && tmthing->z < topz
+ && tmthing->z > tmthing->floorz)
+ {
+ tmfloorz = tmceilingz = INT32_MAX; // block while in air
+#ifdef ESLOPE
+ tmfloorslope = NULL;
+#endif
+ tmfloorthing = thing; // needed for side collision
+ }
+ else if (thing->flags & MF_SPRING)
;
- else if (topz > tmfloorz && tmthing->z >= thing->z)
+ else if (topz > tmfloorz && tmthing->z+tmthing->height >= thing->z)
{
tmfloorz = topz;
#ifdef ESLOPE
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 5e5961d41d1d617371bb341352b5abb0e060e497..e7ec2f8b8af9ab784f9ffb529598afb6d16b2178 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2017,13 +2017,13 @@ static void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motyp
delta2 = thingtop - (bottomheight + ((topheight - bottomheight)/2));
if (topheight > mo->floorz && abs(delta1) < abs(delta2)
&& !(rover->flags & FF_REVERSEPLATFORM)
- && ((P_MobjFlip(mo)*mo->momz > 0) || (!(rover->flags & FF_PLATFORM)))) // In reverse gravity, only clip for FOFs that are intangible from their bottom (the "top" you're falling through) if you're coming from above ("below" in your frame of reference)
+ && ((P_MobjFlip(mo)*mo->momz >= 0) || (!(rover->flags & FF_PLATFORM)))) // In reverse gravity, only clip for FOFs that are intangible from their bottom (the "top" you're falling through) if you're coming from above ("below" in your frame of reference)
{
mo->floorz = topheight;
}
if (bottomheight < mo->ceilingz && abs(delta1) >= abs(delta2)
&& !(rover->flags & FF_PLATFORM)
- && ((P_MobjFlip(mo)*mo->momz > 0) || (!(rover->flags & FF_REVERSEPLATFORM)))) // In normal gravity, only clip for FOFs that are intangible from the top if you're coming from below
+ && ((P_MobjFlip(mo)*mo->momz >= 0) || (!(rover->flags & FF_REVERSEPLATFORM)))) // In normal gravity, only clip for FOFs that are intangible from the top if you're coming from below
{
mo->ceilingz = bottomheight;
}
@@ -6048,6 +6048,8 @@ void P_RunOverlays(void)
P_UnsetThingPosition(mo);
mo->x = destx;
mo->y = desty;
+ mo->radius = mo->target->radius;
+ mo->height = mo->target->height;
if (mo->eflags & MFE_VERTICALFLIP)
mo->z = (mo->target->z + mo->target->height - mo->height) - zoffs;
else
diff --git a/src/p_setup.c b/src/p_setup.c
index e56c44c70616814a2f6f216864f07aaa0e2e8b8f..d656373550dc1615a4f780b08fa51b26578a840a 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2585,11 +2585,7 @@ boolean P_SetupLevel(boolean skipprecip)
lastloadedmaplumpnum = W_GetNumForName(maplumpname = G_BuildMapName(gamemap));
R_ReInitColormaps(mapheaderinfo[gamemap-1]->palette);
- CON_ReSetupBackColormap(mapheaderinfo[gamemap-1]->palette);
-
- // now part of level loading since in future each level may have
- // its own anim texture sequences, switches etc.
- P_InitPicAnims();
+ CON_SetupBackColormap();
// SRB2 determines the sky texture to be used depending on the map header.
P_SetupLevelSky(mapheaderinfo[gamemap-1]->skynum, true);
@@ -3001,6 +2997,9 @@ boolean P_AddWadFile(const char *wadfilename, char **firstmapname)
else
R_FlushTextureCache(); // just reload it from file
+ // Reload ANIMATED / ANIMDEFS
+ P_InitPicAnims();
+
// Flush and reload HUD graphics
ST_UnloadGraphics();
HU_LoadGraphics();
diff --git a/src/p_spec.c b/src/p_spec.c
index 5dac8d34b31d55c676f138ed80b6d951a48a3969..b04c558816596e528d0f2b4497cc86f42522810d 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -221,8 +221,8 @@ static animdef_t harddefs[] =
static animdef_t *animdefs = NULL;
// A prototype; here instead of p_spec.h, so they're "private"
-void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum, INT32 *i);
-void P_ParseAnimationDefintion(SINT8 istexture, INT32 *i);
+void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum);
+void P_ParseAnimationDefintion(SINT8 istexture);
/** Sets up texture and flat animations.
*
@@ -232,24 +232,21 @@ void P_ParseAnimationDefintion(SINT8 istexture, INT32 *i);
* Issues an error if any animation cycles are invalid.
*
* \sa P_FindAnimatedFlat, P_SetupLevelFlatAnims
- * \author Steven McGranahan (original), Shadow Hog (had to rewrite it to handle multiple WADs)
+ * \author Steven McGranahan (original), Shadow Hog (had to rewrite it to handle multiple WADs), JTE (had to rewrite it to handle multiple WADs _correctly_)
*/
void P_InitPicAnims(void)
{
// Init animation
- INT32 i; // Position in the animdefs array
INT32 w; // WAD
- UINT8 *wadAnimdefs; // not to be confused with animdefs, the combined total of every ANIMATED lump in every WAD, or ANIMDEFS, the ZDoom lump I intend to implement later
+ UINT8 *animatedLump;
UINT8 *currentPos;
+ size_t i;
+
+ I_Assert(animdefs == NULL);
if (W_CheckNumForName("ANIMATED") != LUMPERROR || W_CheckNumForName("ANIMDEFS") != LUMPERROR)
{
- if (animdefs)
- {
- Z_Free(animdefs);
- animdefs = NULL;
- }
- for (w = 0, i = 0, maxanims = 0; w < numwadfiles; w++)
+ for (w = numwadfiles-1, maxanims = 0; w >= 0; w--)
{
UINT16 animatedLumpNum;
UINT16 animdefsLumpNum;
@@ -258,20 +255,20 @@ void P_InitPicAnims(void)
animatedLumpNum = W_CheckNumForNamePwad("ANIMATED", w, 0);
if (animatedLumpNum != INT16_MAX)
{
- wadAnimdefs = (UINT8 *)W_CacheLumpNumPwad(w, animatedLumpNum, PU_STATIC);
+ animatedLump = (UINT8 *)W_CacheLumpNumPwad(w, animatedLumpNum, PU_STATIC);
// Get the number of animations in the file
- for (currentPos = wadAnimdefs; *currentPos != UINT8_MAX; maxanims++, currentPos+=23);
+ i = maxanims;
+ for (currentPos = animatedLump; *currentPos != UINT8_MAX; maxanims++, currentPos+=23);
// Resize animdefs (or if it hasn't been created, create it)
animdefs = (animdef_t *)Z_Realloc(animdefs, sizeof(animdef_t)*(maxanims + 1), PU_STATIC, NULL);
// Sanity check it
- if (!animdefs) {
+ if (!animdefs)
I_Error("Not enough free memory for ANIMATED data");
- }
// Populate the new array
- for (currentPos = wadAnimdefs; *currentPos != UINT8_MAX; i++, currentPos+=23)
+ for (currentPos = animatedLump; *currentPos != UINT8_MAX; i++, currentPos+=23)
{
M_Memcpy(&(animdefs[i].istexture), currentPos, 1); // istexture, 1 byte
M_Memcpy(animdefs[i].endname, (currentPos + 1), 9); // endname, 9 bytes
@@ -279,15 +276,13 @@ void P_InitPicAnims(void)
M_Memcpy(&(animdefs[i].speed), (currentPos + 19), 4); // speed, 4 bytes
}
- Z_Free(wadAnimdefs);
+ Z_Free(animatedLump);
}
// Now find ANIMDEFS
animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", w, 0);
if (animdefsLumpNum != INT16_MAX)
- {
- P_ParseANIMDEFSLump(w, animdefsLumpNum, &i);
- }
+ P_ParseANIMDEFSLump(w, animdefsLumpNum);
}
// Define the last one
animdefs[maxanims].istexture = -1;
@@ -347,16 +342,20 @@ void P_InitPicAnims(void)
lastanim->istexture = -1;
R_ClearTextureNumCache(false);
+ // Clear animdefs now that we're done with it.
+ // We'll only be using anims from now on.
if (animdefs != harddefs)
- Z_ChangeTag(animdefs, PU_CACHE);
+ Z_Free(animdefs);
+ animdefs = NULL;
}
-void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum, INT32 *i)
+void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum)
{
char *animdefsLump;
size_t animdefsLumpLength;
char *animdefsText;
char *animdefsToken;
+ char *p;
// Since lumps AREN'T \0-terminated like I'd assumed they should be, I'll
// need to make a space of memory where I can ensure that it will terminate
@@ -376,18 +375,19 @@ void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum, INT32 *i)
Z_Free(animdefsLump);
// Now, let's start parsing this thing
- animdefsToken = M_GetToken(animdefsText);
+ p = animdefsText;
+ animdefsToken = M_GetToken(p);
while (animdefsToken != NULL)
{
if (stricmp(animdefsToken, "TEXTURE") == 0)
{
Z_Free(animdefsToken);
- P_ParseAnimationDefintion(1, i);
+ P_ParseAnimationDefintion(1);
}
else if (stricmp(animdefsToken, "FLAT") == 0)
{
Z_Free(animdefsToken);
- P_ParseAnimationDefintion(0, i);
+ P_ParseAnimationDefintion(0);
}
else if (stricmp(animdefsToken, "OSCILLATE") == 0)
{
@@ -398,23 +398,22 @@ void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum, INT32 *i)
{
I_Error("Error parsing ANIMDEFS lump: Expected \"TEXTURE\" or \"FLAT\", got \"%s\"",animdefsToken);
}
- animdefsToken = M_GetToken(NULL);
+ // parse next line
+ while (*p != '\0' && *p != '\n') ++p;
+ if (*p == '\n') ++p;
+ animdefsToken = M_GetToken(p);
}
Z_Free(animdefsToken);
Z_Free((void *)animdefsText);
}
-void P_ParseAnimationDefintion(SINT8 istexture, INT32 *i)
+void P_ParseAnimationDefintion(SINT8 istexture)
{
char *animdefsToken;
size_t animdefsTokenLength;
char *endPos;
INT32 animSpeed;
-
- // Increase the size to make room for the new animation definition
- maxanims++;
- animdefs = (animdef_t *)Z_Realloc(animdefs, sizeof(animdef_t)*(maxanims + 1), PU_STATIC, NULL);
- animdefs[*i].istexture = istexture;
+ size_t i;
// Startname
animdefsToken = M_GetToken(NULL);
@@ -448,14 +447,39 @@ void P_ParseAnimationDefintion(SINT8 istexture, INT32 *i)
{
I_Error("Error parsing ANIMDEFS lump: lump name \"%s\" exceeds 8 characters", animdefsToken);
}
- strncpy(animdefs[*i].startname, animdefsToken, 9);
+
+ // Search for existing animdef
+ for (i = 0; i < maxanims; i++)
+ if (stricmp(animdefsToken, animdefs[i].startname) == 0)
+ {
+ //CONS_Alert(CONS_NOTICE, "Duplicate animation: %s\n", animdefsToken);
+
+ // If we weren't parsing in reverse order, we would `break` here and parse the new data into the existing slot we found.
+ // Instead, we're just going to skip parsing the rest of this line entirely.
+ Z_Free(animdefsToken);
+ return;
+ }
+
+ // Not found
+ if (i == maxanims)
+ {
+ // Increase the size to make room for the new animation definition
+ maxanims++;
+ animdefs = (animdef_t *)Z_Realloc(animdefs, sizeof(animdef_t)*(maxanims + 1), PU_STATIC, NULL);
+ strncpy(animdefs[i].startname, animdefsToken, 9);
+ }
+
+ // animdefs[i].startname is now set to animdefsToken either way.
Z_Free(animdefsToken);
+ // set texture type
+ animdefs[i].istexture = istexture;
+
// "RANGE"
animdefsToken = M_GetToken(NULL);
if (animdefsToken == NULL)
{
- I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"RANGE\" after \"%s\"'s startname should be", animdefs[*i].startname);
+ I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"RANGE\" after \"%s\"'s startname should be", animdefs[i].startname);
}
if (stricmp(animdefsToken, "ALLOWDECALS") == 0)
{
@@ -470,7 +494,7 @@ void P_ParseAnimationDefintion(SINT8 istexture, INT32 *i)
}
if (stricmp(animdefsToken, "RANGE") != 0)
{
- I_Error("Error parsing ANIMDEFS lump: Expected \"RANGE\" after \"%s\"'s startname, got \"%s\"", animdefs[*i].startname, animdefsToken);
+ I_Error("Error parsing ANIMDEFS lump: Expected \"RANGE\" after \"%s\"'s startname, got \"%s\"", animdefs[i].startname, animdefsToken);
}
Z_Free(animdefsToken);
@@ -478,21 +502,21 @@ void P_ParseAnimationDefintion(SINT8 istexture, INT32 *i)
animdefsToken = M_GetToken(NULL);
if (animdefsToken == NULL)
{
- I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"%s\"'s end texture/flat name should be", animdefs[*i].startname);
+ I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"%s\"'s end texture/flat name should be", animdefs[i].startname);
}
animdefsTokenLength = strlen(animdefsToken);
if (animdefsTokenLength>8)
{
I_Error("Error parsing ANIMDEFS lump: lump name \"%s\" exceeds 8 characters", animdefsToken);
}
- strncpy(animdefs[*i].endname, animdefsToken, 9);
+ strncpy(animdefs[i].endname, animdefsToken, 9);
Z_Free(animdefsToken);
// "TICS"
animdefsToken = M_GetToken(NULL);
if (animdefsToken == NULL)
{
- I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"%s\"'s \"TICS\" should be", animdefs[*i].startname);
+ I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"%s\"'s \"TICS\" should be", animdefs[i].startname);
}
if (stricmp(animdefsToken, "RAND") == 0)
{
@@ -501,7 +525,7 @@ void P_ParseAnimationDefintion(SINT8 istexture, INT32 *i)
}
if (stricmp(animdefsToken, "TICS") != 0)
{
- I_Error("Error parsing ANIMDEFS lump: Expected \"TICS\" in animation definition for \"%s\", got \"%s\"", animdefs[*i].startname, animdefsToken);
+ I_Error("Error parsing ANIMDEFS lump: Expected \"TICS\" in animation definition for \"%s\", got \"%s\"", animdefs[i].startname, animdefsToken);
}
Z_Free(animdefsToken);
@@ -509,7 +533,7 @@ void P_ParseAnimationDefintion(SINT8 istexture, INT32 *i)
animdefsToken = M_GetToken(NULL);
if (animdefsToken == NULL)
{
- I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"%s\"'s animation speed should be", animdefs[*i].startname);
+ I_Error("Error parsing ANIMDEFS lump: Unexpected end of file where \"%s\"'s animation speed should be", animdefs[i].startname);
}
endPos = NULL;
#ifndef AVOID_ERRNO
@@ -523,13 +547,10 @@ void P_ParseAnimationDefintion(SINT8 istexture, INT32 *i)
#endif
|| animSpeed < 0) // Number is not positive
{
- I_Error("Error parsing ANIMDEFS lump: Expected a positive integer for \"%s\"'s animation speed, got \"%s\"", animdefs[*i].startname, animdefsToken);
+ I_Error("Error parsing ANIMDEFS lump: Expected a positive integer for \"%s\"'s animation speed, got \"%s\"", animdefs[i].startname, animdefsToken);
}
- animdefs[*i].speed = animSpeed;
+ animdefs[i].speed = animSpeed;
Z_Free(animdefsToken);
-
- // Increment i before we go, so this doesn't cause issues later
- (*i)++;
}
@@ -7428,7 +7449,7 @@ void T_Pusher(pusher_t *p)
}
else
{
- if (top < thing->z || referrer->floorheight > (thing->z + (thing->height >> 1)))
+ if (top < thing->z || bottom > (thing->z + (thing->height >> 1)))
continue;
if (thing->z + thing->height > top)
touching = true;
diff --git a/src/p_user.c b/src/p_user.c
index 3867137adf75d4f09e5ec59138ec302d1e3d319b..f8dc942c0efd852b6109ae588809d9d0b5cfda08 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2280,14 +2280,13 @@ static void P_DoClimbing(player_t *player)
fixed_t platy;
subsector_t *glidesector;
boolean climb = true;
- boolean onesided = ((player->lastsidehit != -1 && player->lastlinehit != -1) && !(lines[player->lastlinehit].backsector));
platx = P_ReturnThrustX(player->mo, player->mo->angle, player->mo->radius + FixedMul(8*FRACUNIT, player->mo->scale));
platy = P_ReturnThrustY(player->mo, player->mo->angle, player->mo->radius + FixedMul(8*FRACUNIT, player->mo->scale));
- glidesector = R_PointInSubsector(player->mo->x + platx, player->mo->y + platy);
+ glidesector = R_IsPointInSubsector(player->mo->x + platx, player->mo->y + platy);
- if (onesided || glidesector->sector != player->mo->subsector->sector)
+ if (!glidesector || glidesector->sector != player->mo->subsector->sector)
{
boolean floorclimb = false;
boolean thrust = false;
@@ -2295,7 +2294,7 @@ static void P_DoClimbing(player_t *player)
boolean skyclimber = false;
fixed_t floorheight, ceilingheight; // ESLOPE
- if (onesided)
+ if (!glidesector)
floorclimb = true;
else
{
diff --git a/src/r_data.c b/src/r_data.c
index cb5cf3591486abc8ca14b7cc5caf656021e55e54..87b6b1193cfd0e63fe1fe7753bc79e408b53e087 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -1499,6 +1499,9 @@ void R_InitData(void)
CONS_Printf("R_LoadTextures()...\n");
R_LoadTextures();
+ CONS_Printf("P_InitPicAnims()...\n");
+ P_InitPicAnims();
+
CONS_Printf("R_InitSprites()...\n");
R_InitSpriteLumps();
R_InitSprites();
diff --git a/src/r_main.c b/src/r_main.c
index 498f4dab8829aba9db31557f1f5f5a7ea4f1c5d9..1b4322b48be064e7c590c3e737637fdbc2af3595 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -771,7 +771,7 @@ subsector_t *R_PointInSubsector(fixed_t x, fixed_t y)
}
//
-// R_IsPointInSubsector, same as above but returns 0 if not in subsector - this does not work in opengl because of polyvertex_t
+// R_IsPointInSubsector, same as above but returns 0 if not in subsector
//
subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y)
{
@@ -795,7 +795,8 @@ subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y)
ret = &subsectors[nodenum & ~NF_SUBSECTOR];
for (i = 0; i < ret->numlines; i++)
- if (R_PointOnSegSide(x, y, &segs[ret->firstline + i]))
+ //if (R_PointOnSegSide(x, y, &segs[ret->firstline + i])) -- breaks in ogl because polyvertex_t cast over vertex pointers
+ if (P_PointOnLineSide(x, y, segs[ret->firstline + i].linedef) != segs[ret->firstline + i].side)
return 0;
return ret;
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index ea8ade8c1f5b901e800810f64c691982040ada8e..71ee3f79474b6bb48b23a2fbf4127a74fd40e115 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -2647,6 +2647,47 @@ INT32 I_PutEnv(char *variable)
#endif
}
+INT32 I_ClipboardCopy(const char *data, size_t size)
+{
+ char storage[256];
+ if (size > 255)
+ size = 255;
+ memcpy(storage, data, size);
+ storage[size] = 0;
+
+ if (SDL_SetClipboardText(storage))
+ return 0;
+ return -1;
+}
+
+const char *I_ClipboardPaste(void)
+{
+ static char clipboard_modified[256];
+ char *clipboard_contents, *i = clipboard_modified;
+
+ if (!SDL_HasClipboardText())
+ return NULL;
+ clipboard_contents = SDL_GetClipboardText();
+ memcpy(clipboard_modified, clipboard_contents, 255);
+ SDL_free(clipboard_contents);
+ clipboard_modified[255] = 0;
+
+ while (*i)
+ {
+ if (*i == '\n' || *i == '\r')
+ { // End on newline
+ *i = 0;
+ break;
+ }
+ else if (*i == '\t')
+ *i = ' '; // Tabs become spaces
+ else if (*i < 32 || (unsigned)*i > 127)
+ *i = '?'; // Nonprintable chars become question marks
+ ++i;
+ }
+ return (const char *)&clipboard_modified;
+}
+
/** \brief The isWadPathOk function
\param path string path to check
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 4a46813c111ce0e69023e08372958d6d127e7b3d..88bbadd20ad91ecd1aa7a41230700539bd7b7fca 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -220,7 +220,7 @@ static Mix_Chunk *ds2chunk(void *stream)
break;
default: // convert arbitrary hz to 44100.
step = 0;
- frac = ((UINT32)freq << FRACBITS) / 44100;
+ frac = ((UINT32)freq << FRACBITS) / 44100 + 1; //Add 1 to counter truncation.
while (i < samples)
{
o = (INT16)(*s+0x80)<<8; // changed signedness and shift up to 16 bits
diff --git a/src/sdl/ogl_sdl.h b/src/sdl/ogl_sdl.h
index 7e144644ce325d7c18b1d0916ad3fdae3f384421..2d6209f2bb94c1e28e35e96e949c5ddb641f567c 100644
--- a/src/sdl/ogl_sdl.h
+++ b/src/sdl/ogl_sdl.h
@@ -24,7 +24,6 @@ boolean OglSdlSurface(INT32 w, INT32 h);
void OglSdlFinishUpdate(boolean vidwait);
-extern SDL_Window *window;
extern SDL_Renderer *renderer;
extern SDL_GLContext sdlglcontext;
extern Uint16 realwidth;
diff --git a/src/sdl/sdlmain.h b/src/sdl/sdlmain.h
index 7ac32f4b3bf0268be5aaada164426a207195d790..fea1e16487dd8f5c4f7acfbbcf2de94d9ea77b1b 100644
--- a/src/sdl/sdlmain.h
+++ b/src/sdl/sdlmain.h
@@ -71,4 +71,7 @@ void I_GetConsoleEvents(void);
void SDLforceUngrabMouse(void);
+// Needed for some WIN32 functions
+extern SDL_Window *window;
+
#endif
diff --git a/src/sdl12/i_system.c b/src/sdl12/i_system.c
index 888a6a507637e5a6c5d4e2c5de9099fcf34933d1..ed0db653d1f51df07ae714199f5bd9f68c05de21 100644
--- a/src/sdl12/i_system.c
+++ b/src/sdl12/i_system.c
@@ -2666,6 +2666,18 @@ INT32 I_PutEnv(char *variable)
#endif
}
+INT32 I_ClipboardCopy(const char *data, size_t size)
+{
+ (void)data;
+ (void)size;
+ return -1;
+}
+
+char *I_ClipboardPaste(void)
+{
+ return NULL;
+}
+
/** \brief The isWadPathOk function
\param path string path to check
diff --git a/src/v_video.c b/src/v_video.c
index 3cc6d195f51e5b879e2704320cc65c70744a2615..f6a966e673713f0f9e55fe7ec40325e5f40741ca 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -774,43 +774,51 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
if (!screens[0])
return;
- if (x == 0 && y == 0 && w == BASEVIDWIDTH && h == BASEVIDHEIGHT)
- { // Clear the entire screen, from dest to deststop. Yes, this really works.
- memset(screens[0], (UINT8)(c&255), vid.width * vid.height * vid.bpp);
- return;
+ if (c & V_NOSCALESTART)
+ {
+ dest = screens[0] + y*vid.width + x;
+ deststop = screens[0] + vid.rowbytes * vid.height;
}
-
- dest = screens[0] + y*dupy*vid.width + x*dupx;
- deststop = screens[0] + vid.rowbytes * vid.height;
-
- if (w == BASEVIDWIDTH)
- w = vid.width;
- else
- w *= dupx;
- if (h == BASEVIDHEIGHT)
- h = vid.height;
else
- h *= dupy;
-
- if (x && y && x + w < vid.width && y + h < vid.height)
{
- // Center it if necessary
- if (vid.width != BASEVIDWIDTH * dupx)
- {
- // dupx adjustments pretend that screen width is BASEVIDWIDTH * dupx,
- // so center this imaginary screen
- if (c & V_SNAPTORIGHT)
- dest += (vid.width - (BASEVIDWIDTH * dupx));
- else if (!(c & V_SNAPTOLEFT))
- dest += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
+ if (x == 0 && y == 0 && w == BASEVIDWIDTH && h == BASEVIDHEIGHT)
+ { // Clear the entire screen, from dest to deststop. Yes, this really works.
+ memset(screens[0], (UINT8)(c&255), vid.width * vid.height * vid.bpp);
+ return;
}
- if (vid.height != BASEVIDHEIGHT * dupy)
+
+ dest = screens[0] + y*dupy*vid.width + x*dupx;
+ deststop = screens[0] + vid.rowbytes * vid.height;
+
+ if (w == BASEVIDWIDTH)
+ w = vid.width;
+ else
+ w *= dupx;
+ if (h == BASEVIDHEIGHT)
+ h = vid.height;
+ else
+ h *= dupy;
+
+ if (x && y && x + w < vid.width && y + h < vid.height)
{
- // same thing here
- if (c & V_SNAPTOBOTTOM)
- dest += (vid.height - (BASEVIDHEIGHT * dupy)) * vid.width;
- else if (!(c & V_SNAPTOTOP))
- dest += (vid.height - (BASEVIDHEIGHT * dupy)) * vid.width / 2;
+ // Center it if necessary
+ if (vid.width != BASEVIDWIDTH * dupx)
+ {
+ // dupx adjustments pretend that screen width is BASEVIDWIDTH * dupx,
+ // so center this imaginary screen
+ if (c & V_SNAPTORIGHT)
+ dest += (vid.width - (BASEVIDWIDTH * dupx));
+ else if (!(c & V_SNAPTOLEFT))
+ dest += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
+ }
+ if (vid.height != BASEVIDHEIGHT * dupy)
+ {
+ // same thing here
+ if (c & V_SNAPTOBOTTOM)
+ dest += (vid.height - (BASEVIDHEIGHT * dupy)) * vid.width;
+ else if (!(c & V_SNAPTOTOP))
+ dest += (vid.height - (BASEVIDHEIGHT * dupy)) * vid.width / 2;
+ }
}
}
@@ -968,45 +976,38 @@ void V_DrawFadeScreen(void)
}
// Simple translucency with one color, over a set number of lines starting from the top.
-void V_DrawFadeConsBack(INT32 plines, INT32 pcolor)
+void V_DrawFadeConsBack(INT32 plines)
{
- UINT8 *deststop, *colormap, *buf;
+ UINT8 *deststop, *buf;
#ifdef HWRENDER // not win32 only 19990829 by Kin
if (rendermode != render_soft && rendermode != render_none)
{
UINT32 hwcolor;
- switch (pcolor)
+ switch (cons_backcolor.value)
{
- case 0: hwcolor = 0xffffff00; break; //white
- case 1: hwcolor = 0xff800000; break; //orange
- case 2: hwcolor = 0x0000ff00; break; //blue
- case 3: hwcolor = 0x00800000; break; //green
- case 4: hwcolor = 0x80808000; break; //gray
- case 5: hwcolor = 0xff000000; break; //red
- default: hwcolor = 0x00800000; break; //green
+ case 0: hwcolor = 0xffffff00; break; // White
+ case 1: hwcolor = 0x80808000; break; // Gray
+ case 2: hwcolor = 0x40201000; break; // Brown
+ case 3: hwcolor = 0xff000000; break; // Red
+ case 4: hwcolor = 0xff800000; break; // Orange
+ case 5: hwcolor = 0x80800000; break; // Yellow
+ case 6: hwcolor = 0x00800000; break; // Green
+ case 7: hwcolor = 0x0000ff00; break; // Blue
+ case 8: hwcolor = 0x4080ff00; break; // Cyan
+ // Default green
+ default: hwcolor = 0x00800000; break;
}
HWR_DrawConsoleBack(hwcolor, plines);
return;
}
#endif
- switch (pcolor)
- {
- case 0: colormap = cwhitemap; break;
- case 1: colormap = corangemap; break;
- case 2: colormap = cbluemap; break;
- case 3: colormap = cgreenmap; break;
- case 4: colormap = cgraymap; break;
- case 5: colormap = credmap; break;
- default: colormap = cgreenmap; break;
- }
-
// heavily simplified -- we don't need to know x or y position,
// just the stop position
deststop = screens[0] + vid.rowbytes * min(plines, vid.height);
for (buf = screens[0]; buf < deststop; ++buf)
- *buf = colormap[*buf];
+ *buf = consolebgmap[*buf];
}
// Gets string colormap, used for 0x80 color codes
diff --git a/src/v_video.h b/src/v_video.h
index 70255d0ef9c72c80cd866eb65051d0b403dcf2d8..353f84c1d973223e642436000f1464211fdeb7a0 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -145,7 +145,7 @@ void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum);
// fade down the screen buffer before drawing the menu over
void V_DrawFadeScreen(void);
-void V_DrawFadeConsBack(INT32 plines, INT32 pcolor);
+void V_DrawFadeConsBack(INT32 plines);
// draw a single character
void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed);
diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c
index 0331080c8e42acf6941f20ce39588a71e416acc3..80b89a6e64ccc549242b60ee216d0721c4f0096f 100644
--- a/src/win32/win_sys.c
+++ b/src/win32/win_sys.c
@@ -3598,6 +3598,18 @@ INT32 I_PutEnv(char *variable)
return putenv(variable);
}
+INT32 I_ClipboardCopy(const char *data, size_t size)
+{
+ (void)data;
+ (void)size;
+ return -1;
+}
+
+const char *I_ClipboardPaste(void)
+{
+ return NULL;
+}
+
typedef BOOL (WINAPI *p_IsProcessorFeaturePresent) (DWORD);
const CPUInfoFlags *I_CPUInfo(void)
diff --git a/src/win32ce/win_sys.c b/src/win32ce/win_sys.c
index 88764ef733c70f2400ce9101433f69b7fd441337..3b6a472587cc161f214736005c48df406dde9925 100644
--- a/src/win32ce/win_sys.c
+++ b/src/win32ce/win_sys.c
@@ -3470,6 +3470,18 @@ INT32 I_PutEnv(char *variable)
return putenv(variable);
}
+INT32 I_ClipboardCopy(const char *data, size_t size)
+{
+ (void)data;
+ (void)size;
+ return -1;
+}
+
+char *I_ClipboardPaste(void)
+{
+ return NULL;
+}
+
typedef BOOL (WINAPI *MyFunc3) (DWORD);
const CPUInfoFlags *I_CPUInfo(void)