claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some stuff found while testing the installer.

Browse Source
This commit is contained in:
waltje
2018-03-29 03:05:07 -04:00
parent 6366c1bc31
commit bfc507d5f4
6 changed files with 173 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/gameport.c
View File

@@ -8,7 +8,7 @@
* *
* Implementation of a generic Game Port. * Implementation of a generic Game Port.
* *
* Version: @(#)gameport.c 1.0.5 2018/03/27 * Version: @(#)gameport.c 1.0.6 2018/03/28
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk> * Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -173,7 +173,6 @@ gameport_write(uint16_t addr, uint8_t val, void *priv)
timer_clock(); timer_clock();
p->state |= 0x0f; p->state |= 0x0f;
pclog("gameport_write : joysticks_present=%i\n", joysticks_present);
p->axis[0].count = gameport_time(p->joystick->read_axis(p->joystick_dat, 0)); p->axis[0].count = gameport_time(p->joystick->read_axis(p->joystick_dat, 0));
p->axis[1].count = gameport_time(p->joystick->read_axis(p->joystick_dat, 1)); p->axis[1].count = gameport_time(p->joystick->read_axis(p->joystick_dat, 1));

2
src/game/gameport.h
View File

@@ -10,7 +10,7 @@
* *
* NOTE: This module needs a good cleanup someday. * NOTE: This module needs a good cleanup someday.
* *
* Version: @(#)gameport.h 1.0.4 2018/03/19 * Version: @(#)gameport.h 1.0.5 2018/03/28
* *
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk> * Sarah Walker, <tommowalker@tommowalker.co.uk>

18
src/lang/language.h
View File

@@ -10,7 +10,7 @@
* *
* NOTE: FIXME: Strings 2176 and 2193 are same. * NOTE: FIXME: Strings 2176 and 2193 are same.
* *
* Version: @(#)language.h 1.0.4 2018/03/08 * Version: @(#)language.h 1.0.5 2018/03/28
* *
* Author: Fred N. van Kempen, <decwiz@yahoo.com> * Author: Fred N. van Kempen, <decwiz@yahoo.com>
* *
@@ -147,14 +147,14 @@
#define IDS_2141 2141 // "Invalid PCap device" #define IDS_2141 2141 // "Invalid PCap device"
#define IDS_2142 2142 // "&Notify disk change" #define IDS_2142 2142 // "&Notify disk change"
#define IDS_2143 2143 // "Type" #define IDS_2143 2143 // "Type"
#define IDS_2144 2144 // "Standard 2-button joystick(s)" #define IDS_2144 2144 // "Disabled"
#define IDS_2145 2145 // "Standard 4-button joystick" #define IDS_2145 2145 // "Standard 2-button joystick(s)"
#define IDS_2146 2146 // "Standard 6-button joystick" #define IDS_2146 2146 // "Standard 4-button joystick"
#define IDS_2147 2147 // "Standard 8-button joystick" #define IDS_2147 2147 // "Standard 6-button joystick"
#define IDS_2148 2148 // "CH Flightstick Pro" #define IDS_2148 2148 // "Standard 8-button joystick"
#define IDS_2149 2149 // "Microsoft SideWinder Pad" #define IDS_2149 2149 // "CH Flightstick Pro"
#define IDS_2150 2150 // "Thrustmaster Flight Cont.." #define IDS_2150 2150 // "Microsoft SideWinder Pad"
#define IDS_2151 2151 // "Disabled" #define IDS_2151 2151 // "Thrustmaster Flight Cont.."
#define IDS_2152 2152 // "None" #define IDS_2152 2152 // "None"
#define IDS_2153 2153 // "Unable to load Accelerators" #define IDS_2153 2153 // "Unable to load Accelerators"
#define IDS_2154 2154 // "Unable to register Raw Input" #define IDS_2154 2154 // "Unable to register Raw Input"

2
src/video/video.h
View File

@@ -160,7 +160,7 @@ typedef struct {
typedef struct { typedef struct {
int w, h; int w, h;
uint8_t *dat; uint8_t *dat;
uint8_t **line; uint8_t *line[];
} bitmap_t; } bitmap_t;
typedef struct { typedef struct {

18
src/win/VARCem.rc
View File

@@ -8,7 +8,7 @@
* *
* Application resource script for Windows. * Application resource script for Windows.
* *
* Version: @(#)VARCem.rc 1.0.8 2018/03/25 * Version: @(#)VARCem.rc 1.0.9 2018/03/28
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -953,14 +953,14 @@ BEGIN
IDS_2141 "Invalid PCap device" IDS_2141 "Invalid PCap device"
IDS_2142 "&Notify disk change" IDS_2142 "&Notify disk change"
IDS_2143 "Type" IDS_2143 "Type"
IDS_2144 "Standard 2-button joystick(s)" IDS_2144 "Disabled"
IDS_2145 "Standard 4-button joystick" IDS_2145 "Standard 2-button joystick(s)"
IDS_2146 "Standard 6-button joystick" IDS_2146 "Standard 4-button joystick"
IDS_2147 "Standard 8-button joystick" IDS_2147 "Standard 6-button joystick"
IDS_2148 "CH Flightstick Pro" IDS_2148 "Standard 8-button joystick"
IDS_2149 "Microsoft SideWinder Pad" IDS_2149 "CH Flightstick Pro"
IDS_2150 "Thrustmaster Flight Control System" IDS_2150 "Microsoft SideWinder Pad"
IDS_2151 "Disabled" IDS_2151 "Thrustmaster Flight Control System"
IDS_2152 "None" IDS_2152 "None"
IDS_2153 "Unable to load Keyboard Accelerators!" IDS_2153 "Unable to load Keyboard Accelerators!"
IDS_2154 "Unable to register Raw Input!" IDS_2154 "Unable to register Raw Input!"

11
src/win/win_joystick.cpp
View File

@@ -11,7 +11,7 @@
* NOTE: Hacks currently needed to compile with MSVC; DX needs to * NOTE: Hacks currently needed to compile with MSVC; DX needs to
* be updated to 11 or 12 or so. --FvK * be updated to 11 or 12 or so. --FvK
* *
* Version: @(#)win_joystick.cpp 1.0.7 2018/03/26 * Version: @(#)win_joystick.cpp 1.0.8 2018/03/28
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -125,11 +125,11 @@ BOOL CALLBACK DIEnumDeviceObjectsCallback(
return DIENUM_CONTINUE; return DIENUM_CONTINUE;
} }
void joystick_init() void joystick_init(void)
{ {
int c; int c;
if (joystick_type == 7) return; if (joystick_type == JOYSTICK_TYPE_NONE) return;
atexit(joystick_close); atexit(joystick_close);
@@ -203,7 +203,7 @@ void joystick_init()
} }
} }
void joystick_close() void joystick_close(void)
{ {
if (lpdi_joystick[1]) if (lpdi_joystick[1])
{ {
@@ -245,7 +245,7 @@ void joystick_process(void)
{ {
int c, d; int c, d;
if (joystick_type == 7) return; if (joystick_type == JOYSTICK_TYPE_NONE) return;
for (c = 0; c < joysticks_present; c++) for (c = 0; c < joysticks_present; c++)
{ {
@@ -318,4 +318,3 @@ void joystick_process(void)
} }
} }
} }