* Applied 16 bit bmp loading fix to "fancy shadows" version too, forgot before
* (Bugfix) Dink is no longer sometimes incorrectly shown on screen right as a dmod is started * (Windows, DinkC, Performance) Logging code rewritten, it's was horribly slow before. If a DMOD spammed "debug" messages it would previously drastically slow down the entire dmod * (Bugfix) LOAD_SEQUENCE and LOAD_SEQUENCE_NOW fixes, fixes stuff in many dmods * Improved mouse handling on dialog menus, no longer accidently select the first option of the dink menu if you click slow after using HD's escape menu to get there git-svn-id: svn://rtsoft.com/rtsvn/projects/RTDink@1507 353e56fe-9613-0410-8469-b96ad8e6f29c
This commit is contained in:
seth
parent
59d4b5754c
commit
45e7f2bd60
8 changed files with 559 additions and 481 deletions
|
|
@ -193,5 +193,17 @@ first so it should be ok anyway)
|
|||
* DMOD data downloaded from dink network is now cached for that session (it's not going to change so quickly, so why stress DN.com if we don't have to)
|
||||
* (Bugfix) "installing <dmod>..." text message is no longer truncated in a weird way sometimes
|
||||
* (Bugfix) Fixed another issue where a base graphic could fill in with a missing .bmp in a sequence when it shouldn't
|
||||
* Huh, turns out .D files are always loaded before .C files. I switched back to including .D files, otherwise if you didn't do a clean install my start.c changes don't show up
|
||||
* Fixed it so freedink.exe and the old dink can be run directly from the Dink HD directory without crashing. I didn't actually test it before, they didn't like / instead of \ in my .ini previously.
|
||||
I also added the CD and splash.bmp that were missing
|
||||
* Quick tip that pops up when playing the normal game now talks about the F1/F8 instant state save/load feature instead of talking about pressing the "pause icon" which doesn't even exist on the Windows build
|
||||
|
||||
- Note: Just to be safe, save state version has changed, so old save states won't load
|
||||
|
||||
------ Change log for 1.8.0 ----------
|
||||
|
||||
* Applied 16 bit bmp loading fix to "fancy shadows" version too, forgot before
|
||||
* (Bugfix) Dink is no longer sometimes incorrectly shown on screen right as a dmod is started
|
||||
* (Windows, DinkC, Performance) Logging code rewritten, it's was horribly slow before. If a DMOD spammed "debug" messages it would previously drastically slow down the entire dmod
|
||||
* (Bugfix) LOAD_SEQUENCE and LOAD_SEQUENCE_NOW fixes, fixes stuff in many dmods
|
||||
* Improved mouse handling on dialog menus, no longer accidently select the first option of the dink menu if you click slow after using HD's escape menu to get there
|
||||
|
|
|
|||
|
|
@ -172,6 +172,8 @@ const char * GetAppName()
|
|||
|
||||
App::App()
|
||||
{
|
||||
m_logFileHandle = NULL;
|
||||
|
||||
http://www.rtsoft.com
|
||||
|
||||
m_bGhostMode = false;
|
||||
|
|
@ -182,8 +184,8 @@ App::App()
|
|||
m_bDidPostInit = false;
|
||||
m_bHasDMODSupport = true;
|
||||
//for mobiles
|
||||
m_version = 1.79f;
|
||||
m_versionString = "V1.7.9";
|
||||
m_version = 1.80f;
|
||||
m_versionString = "V1.8.0";
|
||||
m_build = 1;
|
||||
m_bCheatsEnabled = false;
|
||||
|
||||
|
|
@ -197,6 +199,11 @@ App::App()
|
|||
App::~App()
|
||||
{
|
||||
|
||||
assert(m_logFileHandle);
|
||||
if (m_logFileHandle)
|
||||
fclose(m_logFileHandle);
|
||||
|
||||
|
||||
//L_ParticleSystem::deinit();
|
||||
}
|
||||
|
||||
|
|
@ -352,7 +359,7 @@ bool App::Init()
|
|||
#ifdef WINAPI
|
||||
OutputDebugString(text.c_str());
|
||||
#endif
|
||||
AddText(text.c_str(), (GetSavePath() + "log.txt").c_str());
|
||||
AddTextToLog(text.c_str(), (GetSavePath() + "log.txt").c_str());
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1018,3 +1025,55 @@ void App::OnUnloadSurfaces()
|
|||
|
||||
//g_transitionSurf.Kill();
|
||||
}
|
||||
|
||||
void App::AddTextToLog(const char *tex, const char *filename)
|
||||
{
|
||||
if (strlen(tex) < 1) return;
|
||||
|
||||
if (m_logFileHandle == NULL)
|
||||
{
|
||||
|
||||
//open 'er up
|
||||
m_logFileHandle = fopen(filename, "wb");
|
||||
if (!m_logFileHandle)
|
||||
{
|
||||
assert(!"huh?");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (!m_logFileHandle) return;
|
||||
fwrite(tex, strlen(tex), 1, m_logFileHandle);
|
||||
|
||||
}
|
||||
|
||||
//our custom LogMsg that isn't slow as shit
|
||||
void LogMsg(const char* traceStr, ...)
|
||||
{
|
||||
va_list argsVA;
|
||||
const int logSize = 1024 * 10;
|
||||
char buffer[logSize];
|
||||
memset((void*)buffer, 0, logSize);
|
||||
|
||||
va_start(argsVA, traceStr);
|
||||
vsnprintf_s(buffer, logSize, logSize, traceStr, argsVA);
|
||||
va_end(argsVA);
|
||||
|
||||
|
||||
OutputDebugString(buffer);
|
||||
OutputDebugString("\n");
|
||||
|
||||
if (IsBaseAppInitted())
|
||||
{
|
||||
GetBaseApp()->GetConsole()->AddLine(buffer);
|
||||
strcat(buffer, "\r\n");
|
||||
//OutputDebugString( (string("writing to ")+GetSavePath()+"log.txt\n").c_str());
|
||||
|
||||
//this is the slow part. Or was...
|
||||
|
||||
|
||||
|
||||
GetApp()->AddTextToLog(buffer, (GetSavePath() + "log.txt").c_str());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@ public:
|
|||
void OnMessage( Message &m );
|
||||
void OnLoadSurfaces();
|
||||
void OnUnloadSurfaces();
|
||||
void AddTextToLog(const char *tex, const char *filename);
|
||||
void AddDroidKeyboardKeys();
|
||||
void RemoveAndroidKeyboardKeys();
|
||||
void AddIcadeProvider();
|
||||
|
|
@ -115,6 +116,8 @@ private:
|
|||
int m_desktopBuild;
|
||||
bool m_bHasDMODSupport;
|
||||
bool m_bCheatsEnabled;
|
||||
FILE * m_logFileHandle;
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -82,9 +82,14 @@ void CursorComponent::OnInput( VariantList *pVList )
|
|||
case MESSAGE_TYPE_GUI_CLICK_START:
|
||||
//HandleClickStart(pt);
|
||||
OnUpdatePos(pt);
|
||||
g_dglo.m_dirInput[DINK_INPUT_BUTTON1] = true;
|
||||
g_dglo.m_dirInputFinished[DINK_INPUT_BUTTON1] = true;
|
||||
g_dinkMouseRightClick = true;
|
||||
|
||||
if (!m_bDisable)
|
||||
{
|
||||
|
||||
g_dglo.m_dirInput[DINK_INPUT_BUTTON1] = true;
|
||||
g_dglo.m_dirInputFinished[DINK_INPUT_BUTTON1] = true;
|
||||
g_dinkMouseRightClick = true;
|
||||
}
|
||||
|
||||
break;
|
||||
case MESSAGE_TYPE_GUI_CLICK_END:
|
||||
|
|
|
|||
|
|
@ -144,17 +144,13 @@ void DMODSetTitleLabel(Entity *pMenu, string myMsg)
|
|||
if (pLabel)
|
||||
{
|
||||
pLabel->RemoveComponentByName("Typer"); // a thing that types stuff
|
||||
|
||||
pLabel->GetComponentByName("TextRender")->GetVar("text")->Set(myMsg);
|
||||
|
||||
|
||||
//just kidding, add typer back
|
||||
|
||||
EntityComponent *pTyper = pLabel->AddComponent(new TyperComponent);
|
||||
pTyper->GetVar("text")->Set(".......");
|
||||
pTyper->GetVar("speedMS")->Set(uint32(500));
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ bool pre_figure_out(const char *line, int load_seq, bool bLoadSpriteOnly);
|
|||
|
||||
#define C_DINK_SCREEN_TRANSITION_TIME_MS 400
|
||||
|
||||
const float SAVE_FORMAT_VERSION = 2.7f;
|
||||
const float SAVE_FORMAT_VERSION = 2.8f;
|
||||
const int C_DINK_FADE_TIME_MS = 300;
|
||||
|
||||
const float G_TRANSITION_SCALE_TRICK = 1.01f;
|
||||
|
|
@ -915,6 +915,7 @@ void load_map(const int num)
|
|||
int holdme,lsize;
|
||||
|
||||
LogMsg("Loading map %d...",num);
|
||||
g_dglos.m_bRenderBackgroundOnLoad = true;
|
||||
|
||||
StreamingInstance *pFile = GetFileManager()->GetStreaming(GetFileLocationString(g_dglos.current_map), NULL, false);
|
||||
|
||||
|
|
@ -1627,6 +1628,8 @@ bool LoadSpriteSingleFrame(string fNameBase, int seq, int oo, int picIndex, eTra
|
|||
g_dglos.g_picInfo[picIndex].box.left = 0;
|
||||
g_dglos.g_picInfo[picIndex].box.right = surfSizeX;
|
||||
g_dglos.g_picInfo[picIndex].box.bottom = surfSizeY;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1803,7 +1806,7 @@ bool load_sprites(char org[512], int seq, int speed, int xoffset, int yoffset, r
|
|||
g_dglos.g_seq[seq].s = g_dglos.g_curPicIndex -1;
|
||||
}
|
||||
|
||||
if (bScanOnly)
|
||||
if (bScanOnly || g_dglos.g_seq[seq].frame[1] == 0)
|
||||
{
|
||||
if (reload)
|
||||
{
|
||||
|
|
@ -1839,7 +1842,8 @@ bool load_sprites(char org[512], int seq, int speed, int xoffset, int yoffset, r
|
|||
break;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
if (bScanOnly)
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -2028,7 +2032,7 @@ bool ReloadSequence(int seqID, int frame, bool bScanOnly)
|
|||
if (g_dglos.g_seq[seqID].m_bFrameSetUsed)
|
||||
{
|
||||
//a set_frame_frame has been used here. This means we may reference another sprite that isn't loaded yet, better check
|
||||
for (int i = 0; i < C_MAX_SPRITE_FRAMES; i++)
|
||||
for (int i = 1; i < C_MAX_SPRITE_FRAMES; i++)
|
||||
{
|
||||
if (g_dglos.g_seq[seqID].frame[i] == 0)
|
||||
{
|
||||
|
|
@ -2082,7 +2086,7 @@ bool figure_out(const char *line, int load_seq)
|
|||
int seqID = atol(ev[3]);
|
||||
|
||||
#ifdef _DEBUG
|
||||
if (seqID == 104)
|
||||
if (seqID == 131)
|
||||
{
|
||||
|
||||
LogMsg("Loading sand stuff");
|
||||
|
|
@ -2162,14 +2166,15 @@ bool pre_figure_out(const char *line, int load_seq, bool bLoadSpriteOnly)
|
|||
int seqID = atol(ev[3]);
|
||||
|
||||
#ifdef _DEBUG
|
||||
if (seqID == 453)
|
||||
if (seqID == 131)
|
||||
{
|
||||
|
||||
// LogMsg("Loading sand stuff prefigure out");
|
||||
LogMsg("Loading sand stuff prefigure out");
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
if (compare(ev[1], "LOAD_SEQUENCE") && g_dglos.g_seq[seqID].active == true)
|
||||
{
|
||||
//detect if this was already set somewhere first in the ini, on original Dink, this is a bug but doesn't matter because it doesn't load it, where with Dink HD LOAD_SEQUENCE_NOW's are
|
||||
|
|
@ -2180,6 +2185,8 @@ bool pre_figure_out(const char *line, int load_seq, bool bLoadSpriteOnly)
|
|||
return bReturn;
|
||||
|
||||
}
|
||||
*/
|
||||
//ignore above, we need it for dmods
|
||||
|
||||
|
||||
ReadFromLoadSequenceString(ev);
|
||||
|
|
@ -2294,8 +2301,13 @@ bool pre_figure_out(const char *line, int load_seq, bool bLoadSpriteOnly)
|
|||
if (special == -1)
|
||||
g_dglos.g_seq[myseq].frame[myframe] = special;
|
||||
else
|
||||
{
|
||||
g_dglos.g_seq[myseq].frame[myframe] = g_dglos.g_seq[special].frame[special2];
|
||||
|
||||
//also copy over the details...
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -2900,12 +2912,19 @@ bool get_box (int spriteID, rtRect32 * pDstRect, rtRect32 * pSrcRect )
|
|||
}
|
||||
|
||||
#ifdef _DEBUG
|
||||
if (g_sprite[spriteID].pseq == 75 )
|
||||
if (g_sprite[spriteID].pseq == 204 )
|
||||
{
|
||||
LogMsg("Yo");
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef _DEBUG
|
||||
if (g_sprite[spriteID].pseq == 202)
|
||||
{
|
||||
LogMsg("Original");
|
||||
}
|
||||
#endif
|
||||
|
||||
int picID = getpic(spriteID);
|
||||
if (g_sprite[spriteID].size == 0) g_sprite[spriteID].size = 100;
|
||||
|
||||
|
|
@ -2922,11 +2941,22 @@ bool get_box (int spriteID, rtRect32 * pDstRect, rtRect32 * pSrcRect )
|
|||
{
|
||||
//wait.. this isn't the original picture, a set_frame_frame has been used! We want the offset from the original.
|
||||
|
||||
/*
|
||||
//is the parent seq of the original an anim?
|
||||
if (g_dglos.g_seq[g_dglos.g_picInfo[originalSurfPic].m_parentSeq].m_bIsAnim && g_dglos.g_picInfo[originalSurfPic].xoffset == 0 && g_dglos.g_picInfo[originalSurfPic].yoffset == 0)
|
||||
if (g_dglos.g_seq[g_dglos.g_picInfo[originalSurfPic].m_parentSeq].m_bIsAnim )
|
||||
{
|
||||
txoffset = g_dglos.g_seq[g_dglos.g_picInfo[originalSurfPic].m_parentSeq].m_xoffset;
|
||||
tyoffset = g_dglos.g_seq[g_dglos.g_picInfo[originalSurfPic].m_parentSeq].m_yoffset;
|
||||
|
||||
//first, does the original pic have stuff set for it?
|
||||
txoffset = g_dglos.g_picInfo[originalSurfPic].xoffset;
|
||||
tyoffset = g_dglos.g_picInfo[originalSurfPic].yoffset;
|
||||
|
||||
if (txoffset == 0 && tyoffset == 0)
|
||||
{
|
||||
//No? Well, how about the whole anim in general
|
||||
txoffset = g_dglos.g_seq[g_dglos.g_picInfo[originalSurfPic].m_parentSeq].m_xoffset;
|
||||
tyoffset = g_dglos.g_seq[g_dglos.g_picInfo[originalSurfPic].m_parentSeq].m_yoffset;
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -2934,6 +2964,13 @@ bool get_box (int spriteID, rtRect32 * pDstRect, rtRect32 * pSrcRect )
|
|||
tyoffset = g_dglos.g_picInfo[originalSurfPic].yoffset;
|
||||
|
||||
}
|
||||
*/
|
||||
// picID = originalSurfPic;
|
||||
// txoffset = g_dglos.g_picInfo[picID].xoffset;
|
||||
//tyoffset = g_dglos.g_picInfo[picID].yoffset;
|
||||
|
||||
txoffset = g_dglos.g_picInfo[picID].xoffset;
|
||||
tyoffset = g_dglos.g_picInfo[picID].yoffset;
|
||||
|
||||
}
|
||||
else
|
||||
|
|
@ -4748,7 +4785,7 @@ morestuff:
|
|||
//this was also in the original dink, amazing nobody saw it?
|
||||
g_dglo.m_dirInputFinished[DINK_INPUT_BUTTON1] = false;
|
||||
g_dglo.m_dirInput[DINK_INPUT_BUTTON1] = false;
|
||||
|
||||
g_dglos.g_playerInfo.mouse = 0;
|
||||
g_dglo.m_dirInputFinished[DINK_INPUT_BUTTON2] = false;
|
||||
g_dglo.m_dirInput[DINK_INPUT_BUTTON2] = false;
|
||||
sjoy.button[1] = false;
|
||||
|
|
@ -5089,7 +5126,7 @@ void draw_sprite_game(LPDIRECTDRAWSURFACE lpdest,int h)
|
|||
//LogMsg("Drawing the rock");
|
||||
}
|
||||
|
||||
if (g_sprite[h].pseq == 75)
|
||||
if (g_sprite[h].pseq == 133)
|
||||
{
|
||||
LogMsg("Drawing a wall");
|
||||
|
||||
|
|
@ -5105,60 +5142,15 @@ void draw_sprite_game(LPDIRECTDRAWSURFACE lpdest,int h)
|
|||
assert(!"Bad rect");
|
||||
}
|
||||
|
||||
//check_seq_status(h);
|
||||
|
||||
//redink1 error checking for out-of-bounds clipping
|
||||
/*if (box_crap.left < 0)
|
||||
box_crap.left = 0;
|
||||
if (box_crap.top < box_real.top)
|
||||
box_crap.top = box_crap.top;
|
||||
if (box_crap.right > box_real.right)
|
||||
box_crap.right = box_real.right;
|
||||
if (box_crap.bottom > box_real.bottom)
|
||||
box_crap.bottom = box_real.bottom;*/
|
||||
|
||||
// Msg("Box_crap: %d %d %d %d, Box_real: %d %d %d %d",box_crap.left,box_crap.top,
|
||||
// box_crap.right, box_crap.bottom,box_real.left,box_real.top,
|
||||
// box_real.right, box_real.bottom);
|
||||
|
||||
/*
|
||||
if (g_sprite[h].pseq != 0)
|
||||
{
|
||||
if (!check_seq_status(g_sprite[h].pseq)) return;
|
||||
assert(!"Bad sprite");
|
||||
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
if (lpdest->m_pSurf && lpdest->m_pSurf->GetSurfaceType() == SoftSurface::SURFACE_RGBA)
|
||||
{
|
||||
if (g_dglos.g_picInfo[getpic(h)].pSurface->m_pSurf->GetSurfaceType() == SoftSurface::SURFACE_RGBA)
|
||||
{
|
||||
|
||||
LogMsg("Doing rgba to rgba..");
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
//check to see if we need a 32 bit buffer for this or not
|
||||
if (lpdest->m_pSurf && lpdest->m_pSurf->GetSurfaceType() == SoftSurface::SURFACE_PALETTE_8BIT)
|
||||
{
|
||||
if (g_pSpriteSurface[getpic(h)]->m_pSurf->GetSurfaceType() == SoftSurface::SURFACE_RGBA)
|
||||
{
|
||||
|
||||
|
||||
//yep, convert what we've got to 32 bit. We don't lose what we've done so far.
|
||||
|
||||
|
||||
assert(lpdest == lpDDSBackGround);
|
||||
|
||||
//convert it to a high color surface on the fly, without losing the data on it
|
||||
|
||||
LPDIRECTDRAWSURFACE pNewSurf = InitOffscreenSurface(C_DINK_SCREENSIZE_X, C_DINK_SCREENSIZE_Y, IDirectDrawSurface::MODE_SHADOW_GL, true, lpdest->m_pSurf);
|
||||
|
||||
|
||||
|
||||
LogMsg("Detected high color bmps that need to drawn to the static landscape, converting backbuffers to 32 bit on the fly.");
|
||||
delete lpDDSBackGround;
|
||||
|
||||
|
|
@ -5179,9 +5171,7 @@ void draw_sprite_game(LPDIRECTDRAWSURFACE lpdest,int h)
|
|||
g_forceBuildBackgroundFromScratch = true;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -5726,7 +5716,7 @@ void place_sprites_game(bool bBackgroundOnly )
|
|||
if (strlen(g_dglos.g_smallMap.sprite[j].script) > 1)
|
||||
{
|
||||
#ifdef _DEBUG
|
||||
LogMsg("Sprite %d is requesting that script %s is loaded when the map is drawn, vision is %d", j, g_dglos.g_smallMap.sprite[j].script, *pvision);
|
||||
//LogMsg("Sprite %d is requesting that script %s is loaded when the map is drawn, vision is %d", j, g_dglos.g_smallMap.sprite[j].script, *pvision);
|
||||
#endif
|
||||
g_sprite[sprite].script = load_script(g_dglos.g_smallMap.sprite[j].script, sprite, true);
|
||||
}
|
||||
|
|
@ -10603,7 +10593,7 @@ void init_scripts(void)
|
|||
if (locate(k,"main"))
|
||||
{
|
||||
#ifdef _DEBUG
|
||||
LogMsg("Screendraw: running main of script %s..", g_scriptInstance[k]->name);
|
||||
//LogMsg("Screendraw: running main of script %s..", g_scriptInstance[k]->name);
|
||||
#endif
|
||||
run_script(k);
|
||||
}
|
||||
|
|
@ -14847,10 +14837,12 @@ void DinkSetCursorPosition(CL_Vec2f vPos)
|
|||
|
||||
}
|
||||
|
||||
if (g_dglos.g_gameMode == 1) //dialog select?
|
||||
if (g_dglos.g_talkInfo.active != 0 && fabs(difY) < 100) //dialog select? the 100 is an ugly hack to get rid of accumulated pixels due to .. something
|
||||
{
|
||||
|
||||
//LogMsg("Mouse diff: %.2f", difY);
|
||||
#ifdef _DEBUG
|
||||
LogMsg("Mouse diff: %.2f", difY);
|
||||
#endif
|
||||
g_dglos.g_playerInfo.mouse += difY;
|
||||
}
|
||||
|
||||
|
|
@ -15781,6 +15773,7 @@ void DrawDinkText(int max_s, int32 *rank)
|
|||
|
||||
void updateFrame()
|
||||
{
|
||||
|
||||
if (!lpDDSBack || g_dglo.m_curLoadState != FINISHED_LOADING) return;
|
||||
bool bRenderDinkText = true;
|
||||
g_dinkFadeAlpha = 0;
|
||||
|
|
@ -16197,8 +16190,12 @@ void load_batch(int linesToProcess, float &percentOut)
|
|||
return;
|
||||
}
|
||||
|
||||
g_sprite[1].x = 200;
|
||||
g_sprite[1].y = 300;
|
||||
// g_sprite[1].x = 200;
|
||||
// g_sprite[1].y = 300;
|
||||
|
||||
|
||||
// g_sprite[1].x = 0;
|
||||
// g_sprite[1].y = 450;
|
||||
}
|
||||
|
||||
for (int i=0; i < linesToProcess; i++)
|
||||
|
|
@ -17318,6 +17315,11 @@ bool LoadState(string const &path, bool bLoadPathsOnly)
|
|||
|
||||
if ( g_dglos.g_gameMode > 2 || g_dglos.m_bRenderBackgroundOnLoad)
|
||||
{
|
||||
if (g_dglos.m_bRenderBackgroundOnLoad && g_sprite[1].brain != 13)
|
||||
{
|
||||
g_forceBuildBackgroundFromScratch = true;
|
||||
}
|
||||
|
||||
if (g_sprite[1].brain != 13)
|
||||
BuildScreenBackground(false, true);
|
||||
}
|
||||
|
|
@ -17618,7 +17620,7 @@ void DinkOnForeground()
|
|||
}
|
||||
|
||||
//reinit any lost surfaces that we need to
|
||||
if ( g_dglos.g_gameMode > 2 || g_dglos.m_bRenderBackgroundOnLoad)
|
||||
if ( g_dglos.g_gameMode > 2 || g_dglos.m_bRenderBackgroundOnLoad )
|
||||
{
|
||||
if (g_dglos.m_bRenderBackgroundOnLoad && g_sprite[1].brain != 13)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -386,7 +386,7 @@
|
|||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\source;..\..\shared;..\..\shared\win\;..\..\shared\util\boost;..\..\shared\ClanLib-2.0\Sources;..\..\shared\win\include;..\..\shared\FliteTTS\include;..\..\shared\Irrlicht\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;BOOST_ALL_NO_LIB;C_GL_MODE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;_NO_DEBUG_HEAP=1;RT_JPG_SUPPORT;RT_DONT_DO_MOVE_TIMER_TRICK;RT_RUNS_IN_BACKGROUND_DISABLED;RT_IPV6;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;BOOST_ALL_NO_LIB;C_GL_MODE;_HAS_ITERATOR_DEBUGGING=0;_SECURE_SCL=0;_NO_DEBUG_HEAP=1;RT_JPG_SUPPORT;RT_DONT_DO_MOVE_TIMER_TRICK;RT_RUNS_IN_BACKGROUND_DISABLED;RT_IPV6;_USE_32BIT_TIME_T;RT_CUSTOM_LOGMSG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
|
|
@ -431,7 +431,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release GL|Win32'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..\source;..\..\shared;..\..\shared\win\;..\..\shared\util\boost;..\..\shared\ClanLib-2.0\Sources;..\..\shared\win\include;..\..\shared\FliteTTS\include;..\dxsdk\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;BOOST_ALL_NO_LIB;_USE_32BIT_TIME_T;C_GL_MODE;RT_JPG_SUPPORT;RT_DONT_DO_MOVE_TIMER_TRICK;RT_IPV6;RT_RUNS_IN_BACKGROUNDD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;BOOST_ALL_NO_LIB;_USE_32BIT_TIME_T;C_GL_MODE;RT_JPG_SUPPORT;RT_DONT_DO_MOVE_TIMER_TRICK;RT_IPV6;RT_CUSTOM_LOGMSG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>PlatformPrecomp.h</PrecompiledHeaderFile>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">
|
||||
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
<LocalDebuggerCommandArguments>-game dmods/akt2</LocalDebuggerCommandArguments>
|
||||
<LocalDebuggerCommandArguments>
|
||||
</LocalDebuggerCommandArguments>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">
|
||||
<LocalDebuggerCommandArguments>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue