eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup display_monitor.h 

See #42
This commit is contained in:
Alexander Batalov 2022-06-18 16:22:28 +03:00
parent c6095b96d9
commit 939893e22f
2 changed files with 45 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/display_monitor.cc
View File

@ -7,6 +7,7 @@
#include "draw.h" #include "draw.h"
#include "game_mouse.h" #include "game_mouse.h"
#include "game_sound.h" #include "game_sound.h"
#include "geometry.h"
#include "interface.h" #include "interface.h"
#include "memory.h" #include "memory.h"
#include "text_font.h" #include "text_font.h"
@ -14,13 +15,38 @@
#include <string.h> #include <string.h>
// The maximum number of lines display monitor can hold. Once this value
// is reached earlier messages are thrown away.
#define DISPLAY_MONITOR_LINES_CAPACITY (100)
// The maximum length of a string in display monitor (in characters).
#define DISPLAY_MONITOR_LINE_LENGTH (80)
#define DISPLAY_MONITOR_X (23)
#define DISPLAY_MONITOR_Y (24)
#define DISPLAY_MONITOR_WIDTH (167)
#define DISPLAY_MONITOR_HEIGHT (60)
#define DISPLAY_MONITOR_HALF_HEIGHT (DISPLAY_MONITOR_HEIGHT / 2)
#define DISPLAY_MONITOR_FONT (101)
#define DISPLAY_MONITOR_BEEP_DELAY (500U)
static void displayMonitorRefresh();
static void displayMonitorScrollUpOnMouseDown(int btn, int keyCode);
static void displayMonitorScrollDownOnMouseDown(int btn, int keyCode);
static void displayMonitorScrollUpOnMouseEnter(int btn, int keyCode);
static void displayMonitorScrollDownOnMouseEnter(int btn, int keyCode);
static void displayMonitorOnMouseExit(int btn, int keyCode);
// 0x51850C // 0x51850C
bool gDisplayMonitorInitialized = false; static bool gDisplayMonitorInitialized = false;
// The rectangle that display monitor occupies in the main interface window. // The rectangle that display monitor occupies in the main interface window.
// //
// 0x518510 // 0x518510
const Rect gDisplayMonitorRect = { static const Rect gDisplayMonitorRect = {
DISPLAY_MONITOR_X, DISPLAY_MONITOR_X,
DISPLAY_MONITOR_Y, DISPLAY_MONITOR_Y,
DISPLAY_MONITOR_X + DISPLAY_MONITOR_WIDTH - 1, DISPLAY_MONITOR_X + DISPLAY_MONITOR_WIDTH - 1,
@ -28,37 +54,37 @@ const Rect gDisplayMonitorRect = {
}; };
// 0x518520 // 0x518520
int gDisplayMonitorScrollDownButton = -1; static int gDisplayMonitorScrollDownButton = -1;
// 0x518524 // 0x518524
int gDisplayMonitorScrollUpButton = -1; static int gDisplayMonitorScrollUpButton = -1;
// 0x56DBFC // 0x56DBFC
char gDisplayMonitorLines[DISPLAY_MONITOR_LINES_CAPACITY][DISPLAY_MONITOR_LINE_LENGTH]; static char gDisplayMonitorLines[DISPLAY_MONITOR_LINES_CAPACITY][DISPLAY_MONITOR_LINE_LENGTH];
// 0x56FB3C // 0x56FB3C
unsigned char* gDisplayMonitorBackgroundFrmData; static unsigned char* gDisplayMonitorBackgroundFrmData;
// 0x56FB40 // 0x56FB40
int _max_disp; static int _max_disp;
// 0x56FB44 // 0x56FB44
bool gDisplayMonitorEnabled; static bool gDisplayMonitorEnabled;
// 0x56FB48 // 0x56FB48
int _disp_curr; static int _disp_curr;
// 0x56FB4C // 0x56FB4C
int _intface_full_width; static int _intface_full_width;
// 0x56FB50 // 0x56FB50
int gDisplayMonitorLinesCapacity; static int gDisplayMonitorLinesCapacity;
// 0x56FB54 // 0x56FB54
int _disp_start; static int _disp_start;
// 0x56FB58 // 0x56FB58
unsigned int gDisplayMonitorLastBeepTimestamp; static unsigned int gDisplayMonitorLastBeepTimestamp;
// 0x431610 // 0x431610
int displayMonitorInit() int displayMonitorInit()
@ -270,7 +296,7 @@ void displayMonitorAddMessage(char* str)
} }
// 0x431A78 // 0x431A78
void displayMonitorRefresh() static void displayMonitorRefresh()
{ {
if (!gDisplayMonitorInitialized) { if (!gDisplayMonitorInitialized) {
return; return;
@ -309,7 +335,7 @@ void displayMonitorRefresh()
} }
// 0x431B70 // 0x431B70
void displayMonitorScrollUpOnMouseDown(int btn, int keyCode) static void displayMonitorScrollUpOnMouseDown(int btn, int keyCode)
{ {
if ((gDisplayMonitorLinesCapacity + _disp_curr - 1) % gDisplayMonitorLinesCapacity != _disp_start) { if ((gDisplayMonitorLinesCapacity + _disp_curr - 1) % gDisplayMonitorLinesCapacity != _disp_start) {
_disp_curr = (gDisplayMonitorLinesCapacity + _disp_curr - 1) % gDisplayMonitorLinesCapacity; _disp_curr = (gDisplayMonitorLinesCapacity + _disp_curr - 1) % gDisplayMonitorLinesCapacity;
@ -318,7 +344,7 @@ void displayMonitorScrollUpOnMouseDown(int btn, int keyCode)
} }
// 0x431B9C // 0x431B9C
void displayMonitorScrollDownOnMouseDown(int btn, int keyCode) static void displayMonitorScrollDownOnMouseDown(int btn, int keyCode)
{ {
if (_disp_curr != _disp_start) { if (_disp_curr != _disp_start) {
_disp_curr = (_disp_curr + 1) % gDisplayMonitorLinesCapacity; _disp_curr = (_disp_curr + 1) % gDisplayMonitorLinesCapacity;
@ -327,19 +353,19 @@ void displayMonitorScrollDownOnMouseDown(int btn, int keyCode)
} }
// 0x431BC8 // 0x431BC8
void displayMonitorScrollUpOnMouseEnter(int btn, int keyCode) static void displayMonitorScrollUpOnMouseEnter(int btn, int keyCode)
{ {
gameMouseSetCursor(MOUSE_CURSOR_SMALL_ARROW_UP); gameMouseSetCursor(MOUSE_CURSOR_SMALL_ARROW_UP);
} }
// 0x431BD4 // 0x431BD4
void displayMonitorScrollDownOnMouseEnter(int btn, int keyCode) static void displayMonitorScrollDownOnMouseEnter(int btn, int keyCode)
{ {
gameMouseSetCursor(MOUSE_CURSOR_SMALL_ARROW_DOWN); gameMouseSetCursor(MOUSE_CURSOR_SMALL_ARROW_DOWN);
} }
// 0x431BE0 // 0x431BE0
void displayMonitorOnMouseExit(int btn, int keyCode) static void displayMonitorOnMouseExit(int btn, int keyCode)
{ {
gameMouseSetCursor(MOUSE_CURSOR_ARROW); gameMouseSetCursor(MOUSE_CURSOR_ARROW);
} }

41
src/display_monitor.h
View File

@ -1,51 +1,10 @@
#ifndef DISPLAY_MONITOR_H #ifndef DISPLAY_MONITOR_H
#define DISPLAY_MONITOR_H #define DISPLAY_MONITOR_H
#include "geometry.h"
// The maximum number of lines display monitor can hold. Once this value
// is reached earlier messages are thrown away.
#define DISPLAY_MONITOR_LINES_CAPACITY (100)
// The maximum length of a string in display monitor (in characters).
#define DISPLAY_MONITOR_LINE_LENGTH (80)
#define DISPLAY_MONITOR_X (23)
#define DISPLAY_MONITOR_Y (24)
#define DISPLAY_MONITOR_WIDTH (167)
#define DISPLAY_MONITOR_HEIGHT (60)
#define DISPLAY_MONITOR_HALF_HEIGHT (DISPLAY_MONITOR_HEIGHT / 2)
#define DISPLAY_MONITOR_FONT (101)
#define DISPLAY_MONITOR_BEEP_DELAY (500U)
extern bool gDisplayMonitorInitialized;
extern const Rect gDisplayMonitorRect;
extern int gDisplayMonitorScrollDownButton;
extern int gDisplayMonitorScrollUpButton;
extern char gDisplayMonitorLines[DISPLAY_MONITOR_LINES_CAPACITY][DISPLAY_MONITOR_LINE_LENGTH];
extern unsigned char* gDisplayMonitorBackgroundFrmData;
extern int _max_disp;
extern bool gDisplayMonitorEnabled;
extern int _disp_curr;
extern int _intface_full_width;
extern int gDisplayMonitorLinesCapacity;
extern int _disp_start;
extern unsigned int gDisplayMonitorLastBeepTimestamp;
int displayMonitorInit(); int displayMonitorInit();
int displayMonitorReset(); int displayMonitorReset();
void displayMonitorExit(); void displayMonitorExit();
void displayMonitorAddMessage(char* string); void displayMonitorAddMessage(char* string);
void displayMonitorRefresh();
void displayMonitorScrollUpOnMouseDown(int btn, int keyCode);
void displayMonitorScrollDownOnMouseDown(int btn, int keyCode);
void displayMonitorScrollUpOnMouseEnter(int btn, int keyCode);
void displayMonitorScrollDownOnMouseEnter(int btn, int keyCode);
void displayMonitorOnMouseExit(int btn, int keyCode);
void displayMonitorDisable(); void displayMonitorDisable();
void displayMonitorEnable(); void displayMonitorEnable();