Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

revise loader return values - nicer interface now.

Browse Source 
This was SVN commit r2281.
This commit is contained in:
janwas 2005-05-11 04:39:21 +00:00
parent 0e4624397a
commit 1ff0d112d2
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/main.cpp
View File

@ -1026,14 +1026,14 @@ static int ProgressiveLoad()
switch(ret)
{
// no load active => no-op (skip code below)
case 1:
return 1;
case 0:
return 0;
// current task didn't complete. we only care about this insofar as the
// load process is therefore not yet finished.
case ERR_TIMED_OUT:
break;
// just finished loading
case 0:
case LDR_ALL_FINISHED:
g_Game->ReallyStartGame();
wcscpy_s(description, ARRAY_SIZE(description), L"Game is starting..");
// LDR_ProgressiveLoad returns L""; set to valid text to

20
source/ps/Loader.cpp
View File

@ -186,9 +186,9 @@ static bool HaveTimeForNextTask(double time_left, double time_budget, int estima
// ("" if finished) and the current progress value.
//
// return semantics:
// - if loading just completed, return 0.
// - if the final load task just completed, return LDR_ALL_FINISHED.
// - if loading is in progress but didn't finish, return ERR_TIMED_OUT.
// - if not currently loading (no-op), return > 0.
// - if not currently loading (no-op), return 0.
// - any other value indicates a failure; the request has been de-queued.
//
// string interface rationale: for better interoperability, we avoid C++
@ -208,14 +208,16 @@ int LDR_ProgressiveLoad(double time_budget, wchar_t* description,
if(state == FIRST_LOAD)
{
state = LOADING;
ret = ERR_TIMED_OUT; // make caller think we did something
// progress already set to 0.0; that'll be passed back.
goto done;
}
// we're called unconditionally from the main loop, so this isn't
// an error; there is just nothing to do.
if(state != LOADING)
return 1;
return 0;
while(!load_requests.empty())
{
@ -261,7 +263,8 @@ int LDR_ProgressiveLoad(double time_budget, wchar_t* description,
progress = current_estimate / total_estimated_duration;
}
// function interrupted itself; need to return ERR_TIMED_OUT
// translate return value
// (function interrupted itself; need to return ERR_TIMED_OUT)
if(ret > 0)
ret = ERR_TIMED_OUT;
@ -271,11 +274,12 @@ int LDR_ProgressiveLoad(double time_budget, wchar_t* description,
// that came up, so that we report can all errors that happen.
if(ret != 0)
goto done;
// else: continue and process next queued task.
}
// queue is empty, we just finished.
state = IDLE;
ret = 0;
ret = LDR_ALL_FINISHED;
// set output params (there are several return points above)
@ -312,10 +316,10 @@ int LDR_NonprogressiveLoad()
switch(ret)
{
case 1:
debug_warn("LDR_NonprogressiveLoad: No load in progress");
return 0;
case 0:
debug_warn("LDR_NonprogressiveLoad: No load in progress");
return 0; // success
case LDR_ALL_FINISHED:
return 0; // success
case ERR_TIMED_OUT:
break; // continue loading

6
source/ps/Loader.h
View File

@ -126,6 +126,8 @@ extern int LDR_EndRegistering();
extern int LDR_Cancel();
const int LDR_ALL_FINISHED = 1;
// process as many of the queued tasks as possible within <time_budget> [s].
// if a task is lengthy, the budget may be exceeded. call from the main loop.
//
@ -133,9 +135,9 @@ extern int LDR_Cancel();
// ("" if finished) and the current progress value.
//
// return semantics:
// - if loading just completed, return 0.
// - if the final load task just completed, return LDR_ALL_FINISHED.
// - if loading is in progress but didn't finish, return ERR_TIMED_OUT.
// - if not currently loading (no-op), return > 0.
// - if not currently loading (no-op), return 0.
// - any other value indicates a failure; the request has been de-queued.
//
// string interface rationale: for better interoperability, we avoid C++