Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Set the server huddraw elements on single-player mode

Browse source 
This fixes huddraw elements not being archived properly when the map starts
This commit is contained in:
smallmodel 2024-11-17 18:26:00 +01:00
parent 2342f08a79
commit 154464cda1
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
4 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/fgame/g_public.h
View file

@ -470,7 +470,7 @@ typedef struct gameImport_s {
void (*Key_GetKeysForCommand)(const char *command, int *key1, int *key2);
void (*ArchiveLevel)(qboolean loading);
void (*AddSvsTimeFixup)(int *piTime);
void (*HudDrawShader)(int info, char *name);
void (*HudDrawShader)(int info, const char *name);
void (*HudDrawAlign)(int info, int horizontalAlign, int verticalAlign);
void (*HudDrawRect)(int info, int x, int y, int width, int height);
void (*HudDrawVirtualSize)(int info, qboolean virtualScreen);

53
code/fgame/huddraw.cpp
View file

@ -45,7 +45,11 @@ void HudDrawShader( int info, const char *name )
gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_SHADER));
HudWriteNumber( info ); // c = info
gi.MSG_WriteString(name); // s = name (shader_name)
gi.MSG_EndCGM();
gi.MSG_EndCGM();
if (g_gametype->integer == GT_SINGLE_PLAYER) {
gi.HudDrawShader(info, name);
}
}
void HudDrawAlign( int info, int horizontalAlign, int verticalAlign )
@ -65,6 +69,10 @@ void HudDrawAlign( int info, int horizontalAlign, int verticalAlign )
gi.MSG_EndCGM();
if (g_gametype->integer == GT_SINGLE_PLAYER) {
gi.HudDrawAlign(info, horizontalAlign, verticalAlign);
}
}
void HudDrawRect(int info, int x, int y, int width, int height)
@ -77,7 +85,10 @@ void HudDrawRect(int info, int x, int y, int width, int height)
gi.MSG_WriteShort(width); // c = probably "width"
gi.MSG_WriteShort(height); // c = probably "height"
gi.MSG_EndCGM();
if (g_gametype->integer == GT_SINGLE_PLAYER) {
gi.HudDrawRect(info, x, y, width, height);
}
}
void HudDrawVirtualSize(int info, int virtualScreen)
@ -85,20 +96,7 @@ void HudDrawVirtualSize(int info, int virtualScreen)
gi.SetBroadcastAll();
gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_VIRTUALSIZE));
HudWriteNumber( info ); // c = info
/*__asm
{
pushad
pushfd
mov eax, virtualScreen
NEG eax
SBB eax, eax
NEG eax
mov virtualScreen, eax
popfd
popad
}*/
gi.MSG_WriteBits(!!virtualScreen, 1); // value = ? bits = 1
// value = esi
// esi = virtualScreen
@ -108,7 +106,10 @@ void HudDrawVirtualSize(int info, int virtualScreen)
// call
gi.MSG_EndCGM();
if (g_gametype->integer == GT_SINGLE_PLAYER) {
gi.HudDrawVirtualSize(info, virtualScreen);
}
}
void HudDrawColor(int info, float *color)
@ -125,7 +126,11 @@ void HudDrawColor(int info, float *color)
gi.MSG_WriteByte(temp[0]); // c = color[2]
gi.MSG_WriteByte(temp[1]); // c = color[1] - Values can be messed up. To be tested.
gi.MSG_WriteByte(temp[2]); // c = color[3] /
gi.MSG_EndCGM();
gi.MSG_EndCGM();
if (g_gametype->integer == GT_SINGLE_PLAYER) {
gi.HudDrawColor(info, color);
}
// Note: Each float value is multiplied by 255.0 and converted to long using ftol function, thats why it's using WriteByte
}
@ -141,6 +146,10 @@ void HudDrawAlpha(int info, float alpha)
gi.MSG_WriteByte(temp); // c = alpha
gi.MSG_EndCGM();
if (g_gametype->integer == GT_SINGLE_PLAYER) {
gi.HudDrawAlpha(info, alpha);
}
// Note: alpha is multiplied by 255.0 and converted to long using ftol function
}
@ -153,6 +162,9 @@ void HudDrawString(int info, const char *string)
gi.MSG_WriteString(string); // s = string (to show)
gi.MSG_EndCGM();
if (g_gametype->integer == GT_SINGLE_PLAYER) {
gi.HudDrawString(info, string);
}
}
void HudDrawFont(int info, const char *fontName)
@ -162,7 +174,10 @@ void HudDrawFont(int info, const char *fontName)
HudWriteNumber( info ); // c = info
gi.MSG_WriteString(fontName); // s = fontName (to use)
gi.MSG_EndCGM();
if (g_gametype->integer == GT_SINGLE_PLAYER) {
gi.HudDrawFont(info, fontName);
}
}
void HudDraw3d( int index, vec3_t vector, int ent_num, qboolean bAlwaysShow, qboolean depth )

2
code/server/server.h
View file

@ -437,7 +437,7 @@ void SV_MasterShutdown (void);
int SV_RateMsec(client_t *client);
void SV_ArchiveHudDrawElements( qboolean loading );
void SV_HudDrawShader( int iInfo, char *name );
void SV_HudDrawShader( int iInfo, const char *name );
void SV_HudDrawAlign( int iInfo, int iHorizontalAlign, int iVerticalAlign );
void SV_HudDrawRect( int iInfo, int iX, int iY, int iWidth, int iHeight );
void SV_HudDrawVirtualSize( int iInfo, qboolean bVirtualScreen );

2
code/server/sv_ccmds.c
View file

@ -1922,7 +1922,7 @@ void SV_ArchiveHudDrawElements(qboolean loading)
SV_HudDrawShader
==================
*/
void SV_HudDrawShader(int iInfo, char *name)
void SV_HudDrawShader(int iInfo, const char *name)
{
#ifndef DEDICATED
Q_strncpyz(cls.HudDrawElements[iInfo].shaderName, name, sizeof(cls.HudDrawElements[iInfo].shaderName));