Synchronize with trunk.

svn path=/branches/ntvdm/; revision=59499
This commit is contained in:
Aleksandar Andrejevic 2013-07-18 00:46:28 +00:00
commit fb7355f834
594 changed files with 76378 additions and 29859 deletions

View file

@ -6,8 +6,8 @@
* 30 Aug 1999
* started - Paolo Pantaleo <paolopan@freemail.it>
*
* 30-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
* Remove all hardcode string to En.rc
* 30-Apr-2005 (Magnus Olsen <magnus@greatlord.com>)
* Remove all hardcoded strings in En.rc
*
*/
@ -18,86 +18,86 @@
INT CommandScreen (LPTSTR param)
{
SHORT x,y;
BOOL bSkipText = FALSE;
SHORT x,y;
BOOL bSkipText = FALSE;
if (_tcsncmp (param, _T("/?"), 2) == 0)
{
ConOutResPaging(TRUE,STRING_SCREEN_HELP);
return 0;
}
if (_tcsncmp (param, _T("/?"), 2) == 0)
{
ConOutResPaging(TRUE,STRING_SCREEN_HELP);
return 0;
}
nErrorLevel = 0;
nErrorLevel = 0;
//get row
while(_istspace(*param))
param++;
//get row
while(_istspace(*param))
param++;
if(!(*param))
{
error_req_param_missing ();
return 1;
}
if (!(*param))
{
error_req_param_missing ();
return 1;
}
y = _ttoi(param);
if (y<0 || y>(maxy-1))
{
ConOutResPuts(STRING_SCREEN_ROW);
y = _ttoi(param);
if (y<0 || y>(maxy-1))
{
ConOutResPuts(STRING_SCREEN_ROW);
return 1;
}
return 1;
}
//get col
if(!(param = _tcschr(param,_T(' '))))
{
error_req_param_missing ();
return 1;
}
//get col
if (!(param = _tcschr(param,_T(' '))))
{
error_req_param_missing ();
return 1;
}
while(_istspace(*param))
param++;
while(_istspace(*param))
param++;
if(!(*param))
{
error_req_param_missing ();
return 1;
}
if (!(*param))
{
error_req_param_missing ();
return 1;
}
x = _ttoi(param);
if (x<0 || x>(maxx-1))
{
ConErrResPuts(STRING_SCREEN_COL);
return 1;
}
x = _ttoi(param);
if (x<0 || x>(maxx-1))
{
ConErrResPuts(STRING_SCREEN_COL);
return 1;
}
//get text
if(!(param = _tcschr(param,_T(' '))))
{
bSkipText = TRUE;
}
else
{
while(_istspace(*param))
param++;
//get text
if (!(param = _tcschr(param,_T(' '))))
{
bSkipText = TRUE;
}
else
{
while(_istspace(*param))
param++;
if(!(*param))
{
bSkipText = TRUE;
}
}
if (!(*param))
{
bSkipText = TRUE;
}
}
bIgnoreEcho = TRUE;
bIgnoreEcho = TRUE;
if(bSkipText)
x=0;
if (bSkipText)
x=0;
SetCursorXY(x,y);
SetCursorXY(x,y);
if(!(bSkipText))
ConOutPuts(param);
if (!(bSkipText))
ConOutPuts(param);
return 0;
return 0;
}
#endif /* INCLUDE_CMD_SCREEN */