* Another bugfix in the .dmod decompresser, fixes issue with Attack of the veggies

* (Windows) Holding Shift in addition to Tab will cause "super turbo" mode, speeding up the game faster than just holding Tab.  (Secret tip:  If you really want to see speed, hold down the Control key too)

git-svn-id: svn://rtsoft.com/rtsvn/projects/RTDink@1525 353e56fe-9613-0410-8469-b96ad8e6f29c
This commit is contained in:
seth 2017-10-18 07:15:53 +00:00
parent e0b2d2e5f0
commit f1bf68da44
12 changed files with 176 additions and 17 deletions

View file

@ -184,8 +184,8 @@ App::App()
m_bDidPostInit = false;
m_bHasDMODSupport = true;
//for mobiles
m_version = 1.88f;
m_versionString = "V1.8.8";
m_version = 1.89f;
m_versionString = "V1.89";
m_build = 1;
m_bCheatsEnabled = false;

View file

@ -98,7 +98,7 @@ void AboutMenuOnSelect(VariantList *pVList) //0=vec2 point of click, 1=entity se
}
if (pEntClicked->GetName() == "dinknetwork")
{
PopUpCreate(pEntClicked->GetParent()->GetParent()->GetParent(), "Would you like to check out `wThe Dink Network``?", "http://www.dinknetwork.com?device="+toString(GetEmulatedPlatformID()),
PopUpCreate(pEntClicked->GetParent()->GetParent()->GetParent(), "Would you like to check out `wThe Dink Network``?", "http://www.dinknetwork.com?platform="+toString(GetEmulatedPlatformID()),
"cancel", "`wCancel", "url", "`wLaunch", true);
return;
}

View file

@ -451,13 +451,16 @@ void DownloadDMODList(Entity *pMenu)
VariantList v;
string url = "www.dinknetwork.com";
uint32 port = 80;
//GetApp()->GetServerInfo(url, port);
v.m_variant[0].Set(url);
string host = "www.dinknetwork.com";
string url = "api";
v.m_variant[0].Set(host);
v.m_variant[1].Set(port);
v.m_variant[2].Set("api");
v.m_variant[2].Set(url);
v.m_variant[3].Set(uint32(NetHTTP::END_OF_DATA_SIGNAL_HTTP)); //need this for it to detect a disconnect instead of the weird RTsoft symbol
pComp->GetFunction("Init")->sig_function(&v);
pComp->GetFunction("OnError")->sig_function.connect(&OnDownloadError);

View file

@ -1065,7 +1065,23 @@ void OnGameMenuRender(VariantList *pVList)
if (DinkGetSpeedUpMode())
{
//3x speed
for (int i = 0; i < 2; i++)
int speedup = 2;
#ifdef WINAPI
if (GetKeyState(VK_SHIFT) & 0xfe)
{
speedup = 8; //super turbo mode
if (GetKeyState(VK_CONTROL) & 0xfe)
{
speedup *= 3; //super turbo mode
}
}
#endif
for (int i = 0; i < speedup; i++)
{
//GetApp()->SetGameTick(GetApp()->GetGameTick() + GetApp()->GetDeltaTick() * 3);
//GetApp()->GetGameTimer()->Update();

View file

@ -671,9 +671,21 @@ void fill_whole_hard(void)
{
for (int y = 0; y < 50; y++)
{
g_dglos.g_hitmap.x[offx +x].y[offy+y] = g_hmap.tile[ realhard(til) ].x[x].y[y];
int tileToWrite = realhard(til);
if (tileToWrite >= 0 && tileToWrite < 800)
{
g_dglos.g_hitmap.x[offx + x].y[offy + y] = g_hmap.tile[tileToWrite].x[x].y[y];
}
else
{
LogMsg("Avoiding crash, it tried to write hardness data to block %d from illegal tile %d",til, tileToWrite);
goto skip;
}
}
}
skip:;
}
}

View file

@ -324,6 +324,11 @@ void IDirectDrawSurface::UpdateShadowSurface()
assert(m_pSurf);
assert(m_pGLSurf);
assert(m_pSurf->GetSurfaceType() == SoftSurface::SURFACE_RGBA);
if (m_pSurf->GetSurfaceType() != SoftSurface::SURFACE_RGBA)
{
LogMsg("Don't know how to deal with surface type %d", m_pSurf->GetSurfaceType());
}
//m_pSurf->FillColor(glColorBytes(0,0,0,0));
if (m_pSurf->GetPixelData())
{