zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-12 23:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

- silenced some warnings.

Browse source
This commit is contained in:
Christoph Oelckers 2021-05-22 15:34:04 +02:00
parent d7a47b2f3a
commit 0c6e2f0c9e
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/common/cutscenes/screenjob.cpp
View file

@ -156,7 +156,7 @@ void AddGenericVideo(DObject* runner, const FString& fn, int soundid, int fps)
int CutsceneDef::GetSound() int CutsceneDef::GetSound()
{ {
int id; int id = -1;
if (soundName.IsNotEmpty()) id = soundEngine->FindSound(soundName); if (soundName.IsNotEmpty()) id = soundEngine->FindSound(soundName);
if (id <= 0) id = soundEngine->FindSoundByResID(soundID); if (id <= 0) id = soundEngine->FindSoundByResID(soundID);
return id; return id;

1
source/core/screenjob_.h
View file

@ -4,6 +4,7 @@
#include "s_soundinternal.h" #include "s_soundinternal.h"
#include "gamestate.h" #include "gamestate.h"
#include "screenjob.h" #include "screenjob.h"
#include "gamecontrol.h"
struct CutsceneDef; struct CutsceneDef;
struct MapRecord; struct MapRecord;

4
wadsrc/static/zscript/engine/screenjob.zs
View file

@ -553,7 +553,7 @@ class ScreenJobRunner : Object
let font = generic_ui? NewSmallFont : SmallFont; let font = generic_ui? NewSmallFont : SmallFont;
let linelen = hudwidth < 640 ? hudwidth * 0.9 - 40 : 560; let linelen = hudwidth < 640 ? hudwidth * 0.9 - 40 : 560;
let lines = font.BreakLines(text, linelen); let lines = font.BreakLines(text, int(linelen));
int count = lines.Count(); int count = lines.Count();
int height = 20 + font.GetHeight() * count; int height = 20 + font.GetHeight() * count;
@ -573,7 +573,7 @@ class ScreenJobRunner : Object
y = hudheight * 0.9 - height; y = hudheight * 0.9 - height;
if (y < 0) y = 0; if (y < 0) y = 0;
Screen.Dim(0, 0.5f, x * hscale, y * vscale, w * hscale, height * vscale); Screen.Dim(0, 0.5f, int(x * hscale), int(y * vscale), int(w * hscale), int(height * vscale));
x += 20; x += 20;
y += 10; y += 10;