fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Simplified the code in HeroAppearance.cpp

Browse Source
This commit is contained in:
NovaRain
2020-02-03 11:21:43 +08:00
parent 53b407b8a5
commit 1f1c39a4bd
5 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
+1
View File
@@ -585,6 +585,7 @@ StartGDialogFix=0
AttackComplexFix=0
;Set to 1 to fix the issue with the division operator treating negative integers as unsigned
;If you still want to perform the unsigned integer division, use the new 'div' operator
DivisionOperatorFix=1
;Set to 1 to enable the balanced bullet distribution formula for burst attacks
artifacts/scripting/headers/define_extra.h
+1 -1
View File
@@ -407,7 +407,7 @@
#define OBJ_DATA_COMBAT_STATE (0x3C) // flags: 1 - combat, 2 - target is out of range, 4 - flee
#define OBJ_DATA_CUR_ACTION_POINT (0x40)
#define OBJ_DATA_DAMAGE_LAST_TURN (0x48)
#define OBJ_DATA_WHO_HIT_ME (0x54)
#define OBJ_DATA_WHO_HIT_ME (0x54) // current target of the critter
// compute attack result data offsets
#define C_ATTACK_SOURCE (0x00)
sfall/FalloutEngine/EngineUtils.cpp
+3 -1
View File
@@ -283,7 +283,7 @@ void SurfaceCopyToMem(long fromX, long fromY, long width, long height, long from
}
}
// copy data from memory to the area of the interface buffer
// safe copy data from memory to the area of the interface buffer
void DrawToSurface(long toX, long toY, long width, long height, long toWidth, long toHeight, BYTE* toSurface, BYTE* fromMem) {
BYTE* _toSurface = toSurface + (toY * toWidth + toX);
BYTE* endToSurf = (toWidth * toHeight) + toSurface;
@@ -297,6 +297,7 @@ void DrawToSurface(long toX, long toY, long width, long height, long toWidth, lo
}
}
// safe copy data from surface to surface with mask
void DrawToSurface(long width, long height, long fromX, long fromY, long fromWidth, BYTE* fromSurf,
long toX, long toY, long toWidth, long toHeight, BYTE* toSurf, int maskRef)
{
@@ -314,6 +315,7 @@ void DrawToSurface(long width, long height, long fromX, long fromY, long fromWid
}
}
// safe copy data from surface to surface
void DrawToSurface(long width, long height, long fromX, long fromY, long fromWidth, BYTE* fromSurf,
long toX, long toY, long toWidth, long toHeight, BYTE* toSurf)
{
sfall/Modules/HeroAppearance.cpp
+80 -84
View File
@@ -20,6 +20,7 @@
#include "..\main.h"
#include "..\FalloutEngine\Fallout2.h"
#include "..\FalloutEngine\EngineUtils.h"
#include "Inventory.h"
#include "LoadGameHook.h"
#include "Message.h"
@@ -145,18 +146,18 @@ static void DeleteWordWrapList(LineNode *CurrentLine) {
/////////////////////////////////////////////////////////////////DAT FUNCTIONS///////////////////////////////////////////////////////////////////////
static void* LoadDat(char*fileName) {
static void* LoadDat(const char* fileName) {
return fo::func::dbase_open(fileName);
}
static void UnloadDat(void *dat) {
static void UnloadDat(void* dat) {
fo::func::dbase_close(dat);
}
/////////////////////////////////////////////////////////////////OTHER FUNCTIONS/////////////////////////////////////////////////////////////////////
static DWORD BuildFrmId(DWORD lstRef, DWORD lstNum) {
return fo::func::art_id(lstRef, lstNum, 0, 0, 0);
return (lstRef << 24) | lstNum;
}
/////////////////////////////////////////////////////////////////APP MOD FUNCTIONS///////////////////////////////////////////////////////////////////
@@ -287,7 +288,7 @@ static void __declspec(naked) AdjustHeroBaseArt() {
// adjust armor art if num below hero art range
static void AdjustHeroArmorArt(DWORD fid) {
if ((fid & 0xF000000) == (fo::OBJ_TYPE_CRITTER << 24) && !PartyControl::IsNpcControlled()) {
if ((fid & 0xF000000) == (fo::ObjType::OBJ_TYPE_CRITTER << 24) && !PartyControl::IsNpcControlled()) {
DWORD fidBase = fid & 0xFFF;
if (fidBase <= critterListSize) {
fo::var::i_fid += critterListSize;
@@ -496,33 +497,47 @@ endFunc:
/////////////////////////////////////////////////////////////////INTERFACE FUNCTIONS/////////////////////////////////////////////////////////////////
static void sub_draw(long subWidth, long subHeight, long fromWidth, long fromHeight, long fromX, long fromY, BYTE *fromBuff,
long toWidth, long toHeight, long toX, long toY, BYTE *toBuff, int maskRef) {
static void surface_draw(long width, long height, long fromWidth, long fromX, long fromY, BYTE *fromBuff,
long toWidth, long toX, long toY, BYTE *toBuff, int maskRef) {
fromBuff += fromY * fromWidth + fromX;
toBuff += toY * toWidth + toX;
for (long h = 0; h < subHeight; h++) {
for (long w = 0; w < subWidth; w++) {
if (fromBuff[w] != maskRef)
toBuff[w] = fromBuff[w];
for (long h = 0; h < height; h++) {
for (long w = 0; w < width; w++) {
if (fromBuff[w] != maskRef) toBuff[w] = fromBuff[w];
}
fromBuff += fromWidth;
toBuff += toWidth;
}
}
static void DrawBody(DWORD critNum, BYTE* surface) {
static void surface_draw(long width, long height, long fromWidth, long fromX, long fromY, BYTE *fromBuff,
long toWidth, long toX, long toY, BYTE *toBuff) {
fromBuff += fromY * fromWidth + fromX;
toBuff += toY * toWidth + toX;
for (long h = 0; h < height; h++) {
for (long w = 0; w < width; w++) toBuff[w] = fromBuff[w];
fromBuff += fromWidth;
toBuff += toWidth;
}
}
static void DrawBody(long critNum, BYTE* surface, long x, long y, long toWidth) {
DWORD critFrmLock;
fo::FrmHeaderData *critFrm = fo::func::art_ptr_lock(BuildFrmId(1, critNum), &critFrmLock);
DWORD critWidth = fo::func::art_frame_width(critFrm, 0, charRotOri);
DWORD critHeight = fo::func::art_frame_length(critFrm, 0, charRotOri);
BYTE *critSurface = fo::func::art_frame_data(critFrm, 0, charRotOri);
sub_draw(critWidth, critHeight, critWidth, critHeight, 0, 0, critSurface, 70, 102, 35 - critWidth / 2, 51 - critHeight / 2, surface, 0);
BYTE* critSurface = fo::func::art_frame_data(critFrm, 0, charRotOri);
long xOffset = x + (35 - (critWidth / 2));
long yOffset = y + (51 - (critHeight / 2));
surface_draw(critWidth, critHeight, critWidth, 0, 0, critSurface, toWidth, xOffset, yOffset, surface, 0);
fo::func::art_ptr_unlock(critFrmLock);
critSurface = nullptr;
}
static void DrawPCConsole() {
@@ -540,21 +555,13 @@ static void DrawPCConsole() {
}
int WinRef = fo::var::edit_win; // char screen window ref
//BYTE *WinSurface = GetWinSurface(WinRef);
fo::Window *WinInfo = fo::func::GNW_find(WinRef);
BYTE *ConSurface = new BYTE [70 * 102];
sub_draw(70, 102, 640, 480, 338, 78, charScrnBackSurface, 70, 102, 0, 0, ConSurface, 0);
//DWORD critNum = fo::var::art_vault_guy_num; // pointer to current base hero critter FrmId
DWORD critNum = fo::var::obj_dude->artFid; // pointer to current armored hero critter FrmId
DrawBody(critNum, ConSurface);
sub_draw(70, 102, 70, 102, 0, 0, ConSurface, WinInfo->width, WinInfo->height, 338, 78, WinInfo->surface, 0);
delete[] ConSurface;
WinInfo = nullptr;
surface_draw(70, 102, 640, 338, 78, charScrnBackSurface, WinInfo->width, 338, 78, WinInfo->surface); // restore background image
DrawBody(critNum, WinInfo->surface, 338, 78, WinInfo->width);
fo::func::win_draw(WinRef);
}
@@ -587,11 +594,11 @@ static void DrawCharNote(bool style, int winRef, DWORD xPosWin, DWORD yPosWin, B
fo::Window *winInfo = fo::func::GNW_find(winRef);
BYTE *PadSurface = new BYTE [280 * 168];
sub_draw(280, 168, widthBG, heightBG, xPosBG, yPosBG, BGSurface, 280, 168, 0, 0, PadSurface, 0);
surface_draw(280, 168, widthBG, xPosBG, yPosBG, BGSurface, 280, 0, 0, PadSurface);
UnlistedFrm *frm = LoadUnlistedFrm((style) ? "AppStyle.frm" : "AppRace.frm", fo::OBJ_TYPE_SKILLDEX);
if (frm) {
sub_draw(frm->frames[0].width, frm->frames[0].height, frm->frames[0].width, frm->frames[0].height, 0, 0, frm->frames[0].indexBuff, 280, 168, 136, 37, PadSurface, 0); // cover buttons pics bottom
fo::DrawToSurface(frm->frames[0].width, frm->frames[0].height, 0, 0, frm->frames[0].width, frm->frames[0].indexBuff, 136, 37, 280, 168, PadSurface, 0); // cover buttons pics bottom
delete frm;
}
@@ -638,7 +645,7 @@ static void DrawCharNote(bool style, int winRef, DWORD xPosWin, DWORD yPosWin, B
}
}
}
sub_draw(280, 168, 280, 168, 0, 0, PadSurface, winInfo->width, winInfo->height, xPosWin, yPosWin, winInfo->surface, 0);
surface_draw(280, 168, 280, 0, 0, PadSurface, winInfo->width, xPosWin, yPosWin, winInfo->surface);
SetFont(oldFont); // restore previous font
fo::func::message_exit(&MsgList);
@@ -646,10 +653,7 @@ static void DrawCharNote(bool style, int winRef, DWORD xPosWin, DWORD yPosWin, B
*(long*)FO_VAR_card_old_fid1 = -1; // reset fid
DeleteWordWrapList(StartLine);
delete[]PadSurface;
CurrentLine = nullptr;
NextLine = nullptr;
winInfo = nullptr;
delete[] PadSurface;
}
static void _stdcall DrawCharNoteNewChar(bool type) {
@@ -684,7 +688,7 @@ void _stdcall HeroSelectWindow(int raceStyleFlag) {
BYTE *winSurface = fo::func::win_get_buf(winRef);
BYTE *mainSurface = new BYTE [484 * 230];
sub_draw(484, 230, 484, 230, 0, 0, frm->frames[0].indexBuff, 484, 230, 0, 0, mainSurface, 0);
surface_draw(484, 230, 484, 0, 0, frm->frames[0].indexBuff, 484, 0, 0, mainSurface);
delete frm;
DWORD MenuUObj, MenuDObj;
@@ -721,13 +725,11 @@ void _stdcall HeroSelectWindow(int raceStyleFlag) {
titleTextWidth = fo::GetTextWidth(titleText);
fo::PrintText(titleText, textColour, 80 - titleTextWidth / 2, 185, titleTextWidth, 484, mainSurface);
sub_draw(484, 230, 484, 230, 0, 0, mainSurface, 484, 230, 0, 0, winSurface, 0);
surface_draw(484, 230, 484, 0, 0, mainSurface, 484, 0, 0, winSurface);
fo::func::win_show(winRef);
SetFont(0x65);
BYTE *ConDraw = new BYTE [70 * 102];
int button = 0;
bool drawFlag = true; // redraw flag for char note pad
@@ -759,9 +761,8 @@ void _stdcall HeroSelectWindow(int raceStyleFlag) {
if (NewTick - RedrawTick > 60) { // time to redraw
RedrawTick = NewTick;
sub_draw(70, 102, 484, 230, 66, 53, mainSurface, 70, 102, 0, 0, ConDraw, 0);
DrawBody(critNum, ConDraw);
sub_draw(70, 102, 70, 102, 0, 0, ConDraw, 484, 230, 66, 53, winSurface, 0);
surface_draw(70, 102, 484, 66, 53, mainSurface, 484, 66, 53, winSurface); // restore background image
DrawBody(critNum, winSurface, 66, 53, 484);
if (drawFlag) {
DrawCharNote(isStyle, winRef, 190, 29, mainSurface, 190, 29, 484, 230);
@@ -832,23 +833,16 @@ void _stdcall HeroSelectWindow(int raceStyleFlag) {
SetAppearanceGlobals(currentRaceVal, currentStyleVal);
fo::func::win_delete(winRef);
delete[]mainSurface;
delete[]ConDraw;
delete[] mainSurface;
fo::func::art_ptr_unlock(MenuUObj);
fo::func::art_ptr_unlock(MenuDObj);
MenuUSurface = nullptr;
MenuDSurface = nullptr;
fo::func::art_ptr_unlock(DidownUObj);
fo::func::art_ptr_unlock(DidownDObj);
DidownUSurface = nullptr;
DidownDSurface = nullptr;
fo::func::art_ptr_unlock(DiupUObj);
fo::func::art_ptr_unlock(DiupDObj);
DiupUSurface = nullptr;
DiupDSurface = nullptr;
SetFont(oldFont);
fo::func::gmouse_set_cursor(oldMouse);
@@ -1103,25 +1097,23 @@ static void __declspec(naked) AddCharScrnButtons() {
newButtonSurface = new BYTE [20 * 18 * 4];
DWORD frmLock; // frm objects for char screen Appearance button
BYTE *frmSurface;
BYTE* frmSurface;
frmSurface = fo::func::art_ptr_lock_data(BuildFrmId(6, 122), 0, 0, &frmLock); // SLUFrm
sub_draw(20, 18, 20, 18, 0, 0, frmSurface, 20, 18 * 4, 0, 0, newButtonSurface, 0);
surface_draw(20, 18, 20, 0, 0, frmSurface, 20, 0, 0, newButtonSurface);
fo::func::art_ptr_unlock(frmLock);
frmSurface = fo::func::art_ptr_lock_data(BuildFrmId(6, 123), 0, 0, &frmLock); // SLDFrm
sub_draw(20, 18, 20, 18, 0, 0, frmSurface, 20, 18 * 4, 0, 18, newButtonSurface, 0);
surface_draw(20, 18, 20, 0, 0, frmSurface, 20, 0, 18, newButtonSurface);
fo::func::art_ptr_unlock(frmLock);
frmSurface = fo::func::art_ptr_lock_data(BuildFrmId(6, 124), 0, 0, &frmLock); // SRUFrm
sub_draw(20, 18, 20, 18, 0, 0, frmSurface, 20, 18 * 4, 0, 18 * 2, newButtonSurface, 0);
surface_draw(20, 18, 20, 0, 0, frmSurface, 20, 0, 18 * 2, newButtonSurface);
fo::func::art_ptr_unlock(frmLock);
frmSurface = fo::func::art_ptr_lock_data(BuildFrmId(6, 125), 0, 0, &frmLock); // SRDFrm
sub_draw(20, 18, 20, 18, 0, 0, frmSurface, 20, 18 * 4, 0, 18 * 3, newButtonSurface, 0);
surface_draw(20, 18, 20, 0, 0, frmSurface, 20, 0, 18 * 3, newButtonSurface);
fo::func::art_ptr_unlock(frmLock);
frmSurface = nullptr;
}
if (raceButtons) { // race selection buttons
fo::func::win_register_button(WinRef, 348, 37, 20, 18, -1, -1, -1, 0x511, newButtonSurface, newButtonSurface + (20 * 18), 0, 0x20);
@@ -1160,69 +1152,73 @@ static void __declspec(naked) FixCharScrnBack() {
UnlistedFrm *frm = LoadUnlistedFrm((fo::var::glblmode) ? "AppChCrt.frm" : "AppChEdt.frm", fo::OBJ_TYPE_INTRFACE);
if (frm != nullptr) {
sub_draw(640, 480, 640, 480, 0, 0, frm->frames[0].indexBuff, 640, 480, 0, 0, charScrnBackSurface, 0);
surface_draw(640, 480, 640, 0, 0, frm->frames[0].indexBuff, 640, 0, 0, charScrnBackSurface);
delete frm;
} else {
BYTE *OldCharScrnBackSurface = fo::var::bckgnd; // char screen background frm surface
BYTE* oldCharScrnBackSurface = fo::var::bckgnd; // char screen background frm surface
// copy old charscrn surface to new
sub_draw(640, 480, 640, 480, 0, 0, OldCharScrnBackSurface, 640, 480, 0, 0, charScrnBackSurface, 0);
surface_draw(640, 480, 640, 0, 0, oldCharScrnBackSurface, 640, 0, 0, charScrnBackSurface);
// copy Tag Skill Counter background to the right
sub_draw(38, 26, 640, 480, 519, 228, OldCharScrnBackSurface, 640, 480, 519 + 36, 228, charScrnBackSurface, 0);
surface_draw(38, 26, 640, 519, 228, oldCharScrnBackSurface, 640, 519 + 36, 228, charScrnBackSurface);
// copy a blank part of the Tag Skill Bar hiding the old counter
sub_draw(38, 26, 640, 480, 460, 228, OldCharScrnBackSurface, 640, 480, 519, 228, charScrnBackSurface, 0);
surface_draw(38, 26, 640, 460, 228, oldCharScrnBackSurface, 640, 519, 228, charScrnBackSurface);
sub_draw(36, 258, 640, 480, 332, 0, OldCharScrnBackSurface, 640, 480, 408, 0, charScrnBackSurface, 0); // shift behind button rail
sub_draw(6, 32, 640, 480, 331, 233, OldCharScrnBackSurface, 640, 480, 330, 6, charScrnBackSurface, 0); // shadow for style/race button
surface_draw(36, 258, 640, 332, 0, oldCharScrnBackSurface, 640, 408, 0, charScrnBackSurface); // shift behind button rail
surface_draw(6, 32, 640, 331, 233, oldCharScrnBackSurface, 640, 330, 6, charScrnBackSurface); // shadow for style/race button
DWORD FrmObj, FrmMaskObj; // frm objects for char screen Appearance button
BYTE *FrmSurface, *FrmMaskSurface;
FrmSurface = fo::func::art_ptr_lock_data(BuildFrmId(fo::OBJ_TYPE_INTRFACE, 113), 0, 0, &FrmObj); // "Use Item On" window
sub_draw(81, 132, 292, 376, 163, 20, FrmSurface, 640, 480, 331, 63, charScrnBackSurface, 0); // char view win
sub_draw(79, 31, 292, 376, 154, 228, FrmSurface, 640, 480, 331, 32, charScrnBackSurface, 0); // upper char view win
sub_draw(79, 30, 292, 376, 158, 236, FrmSurface, 640, 480, 331, 195, charScrnBackSurface, 0); // lower char view win
surface_draw(81, 132, 292, 163, 20, FrmSurface, 640, 331, 63, charScrnBackSurface); // char view win
surface_draw(79, 31, 292, 154, 228, FrmSurface, 640, 331, 32, charScrnBackSurface); // upper char view win
surface_draw(79, 30, 292, 158, 236, FrmSurface, 640, 331, 195, charScrnBackSurface); // lower char view win
fo::func::art_ptr_unlock(FrmObj);
// Sexoff Frm
FrmSurface = fo::func::art_ptr_lock_data(BuildFrmId(fo::OBJ_TYPE_INTRFACE, 188), 0, 0, &FrmObj);
BYTE* newFrmSurface = new BYTE [80 * 32];
surface_draw(80, 32, 80, 0, 0, FrmSurface, 80, 0, 0, newFrmSurface);
fo::func::art_ptr_unlock(FrmObj);
// Sex button mask frm
FrmMaskSurface = fo::func::art_ptr_lock_data(BuildFrmId(fo::OBJ_TYPE_INTRFACE, 187), 0, 0, &FrmMaskObj);
sub_draw(80, 28, 80, 32, 0, 0, FrmMaskSurface, 80, 32, 0, 0, FrmSurface, 0x39); // mask for style and race buttons
// crop the Sexoff image by mask
surface_draw(80, 28, 80, 0, 0, FrmMaskSurface, 80, 0, 0, newFrmSurface, 0x39); // mask for style and race buttons
fo::func::art_ptr_unlock(FrmMaskObj);
FrmMaskSurface = nullptr;
FrmSurface[80 * 32 - 1] = 0;
FrmSurface[80 * 31 - 1] = 0;
FrmSurface[80 * 30 - 1] = 0;
newFrmSurface[80 * 32 - 1] = 0;
newFrmSurface[80 * 31 - 1] = 0;
newFrmSurface[80 * 30 - 1] = 0;
FrmSurface[80 * 32 - 2] = 0;
FrmSurface[80 * 31 - 2] = 0;
FrmSurface[80 * 30 - 2] = 0;
newFrmSurface[80 * 32 - 2] = 0;
newFrmSurface[80 * 31 - 2] = 0;
newFrmSurface[80 * 30 - 2] = 0;
FrmSurface[80 * 32 - 3] = 0;
FrmSurface[80 * 31 - 3] = 0;
FrmSurface[80 * 30 - 3] = 0;
newFrmSurface[80 * 32 - 3] = 0;
newFrmSurface[80 * 31 - 3] = 0;
newFrmSurface[80 * 30 - 3] = 0;
FrmSurface[80 * 32 - 4] = 0;
FrmSurface[80 * 31 - 4] = 0;
FrmSurface[80 * 30 - 4] = 0;
newFrmSurface[80 * 32 - 4] = 0;
newFrmSurface[80 * 31 - 4] = 0;
newFrmSurface[80 * 30 - 4] = 0;
sub_draw(80, 32, 80, 32, 0, 0, FrmSurface, 640, 480, 332, 0, charScrnBackSurface, 0); // style and race buttons
sub_draw(80, 32, 80, 32, 0, 0, FrmSurface, 640, 480, 332, 225, charScrnBackSurface, 0); // style and race buttons
fo::func::art_ptr_unlock(FrmObj);
surface_draw(80, 32, 80, 0, 0, newFrmSurface, 640, 332, 0, charScrnBackSurface, 0); // race buttons
surface_draw(80, 32, 80, 0, 0, newFrmSurface, 640, 332, 225, charScrnBackSurface, 0); // style buttons
delete[] newFrmSurface;
// frm background for char screen Appearance button
if (fo::var::glblmode && (styleButtons || raceButtons)) {
FrmSurface = fo::func::art_ptr_lock_data(BuildFrmId(fo::OBJ_TYPE_INTRFACE, 174), 0, 0, &FrmObj); // Pickchar frm
if (raceButtons) sub_draw(69, 20, 640, 480, 281, 319, FrmSurface, 640, 480, 337, 36, charScrnBackSurface, 0); // button backround top
if (styleButtons) sub_draw(69, 20, 640, 480, 281, 319, FrmSurface, 640, 480, 337, 198, charScrnBackSurface, 0); // button backround bottom
if (raceButtons) surface_draw(69, 20, 640, 281, 319, FrmSurface, 640, 337, 36, charScrnBackSurface); // button backround top
if (styleButtons) surface_draw(69, 20, 640, 281, 319, FrmSurface, 640, 337, 198, charScrnBackSurface); // button backround bottom
fo::func::art_ptr_unlock(FrmObj);
}
FrmSurface = nullptr;
}
int oldFont = GetFont();
sfall/Modules/Scripting/Handlers/Math.cpp
+2 -2
View File
@@ -45,7 +45,7 @@ void sf_sqrt(OpcodeContext& ctx) {
void sf_abs(OpcodeContext& ctx) {
if (ctx.arg(0).isInt()) {
ctx.setReturn(abs((int)ctx.arg(0).rawValue()));
ctx.setReturn(abs(static_cast<int>(ctx.arg(0).rawValue())));
} else {
ctx.setReturn(abs(ctx.arg(0).asFloat()));
}
@@ -74,7 +74,7 @@ void sf_power(OpcodeContext& ctx) {
if (power.isFloat())
result = pow(base.asFloat(), power.floatValue());
else
result = pow(base.asFloat(), (int)power.rawValue());
result = pow(base.asFloat(), static_cast<int>(power.rawValue()));
if (base.isInt() && power.isInt()) {
ctx.setReturn(static_cast<int>(result));