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

Fix called shot window position 

See #3
This commit is contained in:
Alexander Batalov 2022-05-21 03:05:43 +03:00
parent f556b7ba2d
commit 227bd81fda
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/combat.c
View File

@ -38,6 +38,10 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#define CALLED_SHOT_WINDOW_Y (20)
#define CALLED_SHOT_WINDOW_WIDTH (504)
#define CALLED_SHOT_WINDOW_HEIGHT (309)
// 0x500B50 // 0x500B50
char _a_1[] = "."; char _a_1[] = ".";
@ -5256,7 +5260,20 @@ int calledShotSelectHitLocation(Object* critter, int* hitLocation, int hitMode)
} }
gCalledShotCritter = critter; gCalledShotCritter = critter;
gCalledShotWindow = windowCreate(CALLED_SHOW_WINDOW_X, CALLED_SHOW_WINDOW_Y, CALLED_SHOW_WINDOW_WIDTH, CALLED_SHOW_WINDOW_HEIGHT, _colorTable[0], WINDOW_FLAG_0x10);
// The default value is 68, which centers called shot window given it's
// width (68 - 504 - 68).
int calledShotWindowX = (screenGetWidth() - CALLED_SHOT_WINDOW_WIDTH) / 2;
// Center vertically for HRP, otherwise maintain original location (20).
int calledShotWindowY = screenGetHeight() != 480
? (screenGetHeight() - 100 - 1 - CALLED_SHOT_WINDOW_HEIGHT) / 2
: CALLED_SHOT_WINDOW_Y;
gCalledShotWindow = windowCreate(calledShotWindowX,
calledShotWindowY,
CALLED_SHOT_WINDOW_WIDTH,
CALLED_SHOT_WINDOW_HEIGHT,
_colorTable[0],
WINDOW_FLAG_0x10);
if (gCalledShotWindow == -1) { if (gCalledShotWindow == -1) {
return -1; return -1;
} }
@ -5274,13 +5291,13 @@ int calledShotSelectHitLocation(Object* critter, int* hitLocation, int hitMode)
return -1; return -1;
} }
blitBufferToBuffer(data, CALLED_SHOW_WINDOW_WIDTH, CALLED_SHOW_WINDOW_HEIGHT, CALLED_SHOW_WINDOW_WIDTH, windowBuffer, CALLED_SHOW_WINDOW_WIDTH); blitBufferToBuffer(data, CALLED_SHOT_WINDOW_WIDTH, CALLED_SHOT_WINDOW_HEIGHT, CALLED_SHOT_WINDOW_WIDTH, windowBuffer, CALLED_SHOT_WINDOW_WIDTH);
artUnlock(handle); artUnlock(handle);
fid = buildFid(1, critter->fid & 0xFFF, ANIM_CALLED_SHOT_PIC, 0, 0); fid = buildFid(1, critter->fid & 0xFFF, ANIM_CALLED_SHOT_PIC, 0, 0);
data = artLockFrameData(fid, 0, 0, &handle); data = artLockFrameData(fid, 0, 0, &handle);
if (data != NULL) { if (data != NULL) {
blitBufferToBuffer(data, 170, 225, 170, windowBuffer + CALLED_SHOW_WINDOW_WIDTH * 31 + 168, CALLED_SHOW_WINDOW_WIDTH); blitBufferToBuffer(data, 170, 225, 170, windowBuffer + CALLED_SHOT_WINDOW_WIDTH * 31 + 168, CALLED_SHOT_WINDOW_WIDTH);
artUnlock(handle); artUnlock(handle);
} }
@ -5317,14 +5334,14 @@ int calledShotSelectHitLocation(Object* critter, int* hitLocation, int hitMode)
int btn; int btn;
probability = _determine_to_hit(gDude, critter, _hit_loc_left[index], hitMode); probability = _determine_to_hit(gDude, critter, _hit_loc_left[index], hitMode);
_print_tohit(windowBuffer + CALLED_SHOW_WINDOW_WIDTH * (_call_ty[index] - 86) + 33, CALLED_SHOW_WINDOW_WIDTH, probability); _print_tohit(windowBuffer + CALLED_SHOT_WINDOW_WIDTH * (_call_ty[index] - 86) + 33, CALLED_SHOT_WINDOW_WIDTH, probability);
btn = buttonCreate(gCalledShotWindow, 33, _call_ty[index] - 90, 128, 20, index, index, -1, index, NULL, NULL, NULL, 0); btn = buttonCreate(gCalledShotWindow, 33, _call_ty[index] - 90, 128, 20, index, index, -1, index, NULL, NULL, NULL, 0);
buttonSetMouseCallbacks(btn, _draw_loc_on_, _draw_loc_off, NULL, NULL); buttonSetMouseCallbacks(btn, _draw_loc_on_, _draw_loc_off, NULL, NULL);
_draw_loc_(index, _colorTable[992]); _draw_loc_(index, _colorTable[992]);
probability = _determine_to_hit(gDude, critter, _hit_loc_right[index], hitMode); probability = _determine_to_hit(gDude, critter, _hit_loc_right[index], hitMode);
_print_tohit(windowBuffer + CALLED_SHOW_WINDOW_WIDTH * (_call_ty[index] - 86) + 453, CALLED_SHOW_WINDOW_WIDTH, probability); _print_tohit(windowBuffer + CALLED_SHOT_WINDOW_WIDTH * (_call_ty[index] - 86) + 453, CALLED_SHOT_WINDOW_WIDTH, probability);
btn = buttonCreate(gCalledShotWindow, 341, _call_ty[index] - 90, 128, 20, index + 4, index + 4, -1, index + 4, NULL, NULL, NULL, 0); btn = buttonCreate(gCalledShotWindow, 341, _call_ty[index] - 90, 128, 20, index + 4, index + 4, -1, index + 4, NULL, NULL, NULL, 0);
buttonSetMouseCallbacks(btn, _draw_loc_on_, _draw_loc_off, NULL, NULL); buttonSetMouseCallbacks(btn, _draw_loc_on_, _draw_loc_off, NULL, NULL);

5
src/combat.h
View File

@ -9,11 +9,6 @@
#include "party_member.h" #include "party_member.h"
#include "proto_types.h" #include "proto_types.h"
#define CALLED_SHOW_WINDOW_X (68)
#define CALLED_SHOW_WINDOW_Y (20)
#define CALLED_SHOW_WINDOW_WIDTH (504)
#define CALLED_SHOW_WINDOW_HEIGHT (309)
extern char _a_1[]; extern char _a_1[];
extern int _combat_turn_running; extern int _combat_turn_running;