Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Replaced all CStr16 with CStrW, because its name was too confusing

Browse Source 
This was SVN commit r1109.
This commit is contained in:
Ykkrosh 2004-09-03 14:08:12 +00:00
parent ec7ace7016
commit 03ae01c44a
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/ps/CConsole.cpp
View File

@ -497,14 +497,14 @@ void CConsole::ProcessBuffer(const wchar_t* szLine){
{
// Process it as JavaScript
g_ScriptingHost.ExecuteScript( CStr16( szLine + 1 ) );
g_ScriptingHost.ExecuteScript( CStrW( szLine + 1 ) );
}
else if (szLine[0] == '?')
{
// Process it as JavaScript and display the result
jsval rval = g_ScriptingHost.ExecuteScript( CStr16( szLine + 1 ) );
jsval rval = g_ScriptingHost.ExecuteScript( CStrW( szLine + 1 ) );
if (rval)
{
try {

2
source/ps/UniDoubler.h
View File

@ -9,8 +9,6 @@
#undef CStr
#undef CStr_hash_compare
#define CStr CStrW
// Compat for old code. *Deprecated* CStrW isn't 16-bit - it is "wide"
#define CStr16 CStrW
#define CStr_hash_compare CStrW_hash_compare
#include UNIDOUBLER_HEADER

4
source/scripting/ScriptGlue.cpp
View File

@ -177,7 +177,7 @@ JSBool setTimeout( JSContext* context, JSObject* UNUSEDPARAM(globalObject), unsi
{
case JSTYPE_STRING:
{
CStr16 fragment = g_ScriptingHost.ValueToUCString( argv[0] );
CStrW fragment = g_ScriptingHost.ValueToUCString( argv[0] );
g_Scheduler.pushTime( delay, fragment, JS_GetScopeChain( context ) );
return( JS_TRUE );
}
@ -221,7 +221,7 @@ JSBool setInterval( JSContext* context, JSObject* UNUSEDPARAM(globalObject), uns
{
case JSTYPE_STRING:
{
CStr16 fragment = g_ScriptingHost.ValueToUCString( argv[0] );
CStrW fragment = g_ScriptingHost.ValueToUCString( argv[0] );
g_Scheduler.pushInterval( first, interval, fragment, JS_GetScopeChain( context ) );
return( JS_TRUE );
}

10
source/simulation/Scheduler.cpp
View File

@ -15,17 +15,17 @@ void CScheduler::pushFrame( size_t delay, const HEntity& destination, const CMes
frameMessage.push( SDispatchObjectMessage( destination, frameCount + delay, message ) );
}
void CScheduler::pushTime( size_t delay, const CStr16& fragment, JSObject* operateOn )
void CScheduler::pushTime( size_t delay, const CStrW& fragment, JSObject* operateOn )
{
timeScript.push( SDispatchObjectScript( fragment, simulationTime + delay, operateOn ) );
}
void CScheduler::pushFrame( size_t delay, const CStr16& fragment, JSObject* operateOn )
void CScheduler::pushFrame( size_t delay, const CStrW& fragment, JSObject* operateOn )
{
frameScript.push( SDispatchObjectScript( fragment, frameCount + delay, operateOn ) );
}
void CScheduler::pushInterval( size_t first, size_t interval, const CStr16& fragment, JSObject* operateOn )
void CScheduler::pushInterval( size_t first, size_t interval, const CStrW& fragment, JSObject* operateOn )
{
timeScript.push( SDispatchObjectScript( fragment, simulationTime + first, operateOn, interval ) );
}
@ -75,7 +75,7 @@ void CScheduler::update(size_t simElapsed)
break;
timeScript.pop();
m_abortInterval = false;
g_ScriptingHost.ExecuteScript( top.script, CStr16( L"timer" ), top.operateOn );
g_ScriptingHost.ExecuteScript( top.script, CStrW( L"timer" ), top.operateOn );
if( top.isRecurrent && !m_abortInterval )
pushInterval( top.delay, top.delay, top.script, top.operateOn );
}
@ -85,7 +85,7 @@ void CScheduler::update(size_t simElapsed)
if( top.deliveryTime > frameCount )
break;
frameScript.pop();
g_ScriptingHost.ExecuteScript( top.script, CStr16( L"timer" ), top.operateOn );
g_ScriptingHost.ExecuteScript( top.script, CStrW( L"timer" ), top.operateOn );
}
while( !timeFunction.empty() )
{

12
source/simulation/Scheduler.h
View File

@ -43,11 +43,11 @@ struct SDispatchObjectMessage : public SDispatchObject
struct SDispatchObjectScript : public SDispatchObject
{
CStr16 script;
CStrW script;
JSObject* operateOn;
inline SDispatchObjectScript( const CStr16& _script, const size_t _deliveryTime, JSObject* _operateOn = NULL )
inline SDispatchObjectScript( const CStrW& _script, const size_t _deliveryTime, JSObject* _operateOn = NULL )
: SDispatchObject( _deliveryTime ), script( _script ), operateOn( _operateOn ) {}
inline SDispatchObjectScript( const CStr16& _script, const size_t _deliveryTime, JSObject* _operateOn, const size_t recurrence )
inline SDispatchObjectScript( const CStrW& _script, const size_t _deliveryTime, JSObject* _operateOn, const size_t recurrence )
: SDispatchObject( _deliveryTime, recurrence ), script( _script ), operateOn( _operateOn ) {}
};
@ -71,9 +71,9 @@ struct CScheduler : public Singleton<CScheduler>
void pushTime( size_t delay, const HEntity& destination, const CMessage* message );
void pushFrame( size_t delay, const HEntity& destination, const CMessage* message );
void pushTime( size_t delay, const CStr16& fragment, JSObject* operateOn = NULL );
void pushFrame( size_t delay, const CStr16& fragment, JSObject* operateOn = NULL );
void pushInterval( size_t first, size_t interval, const CStr16& fragment, JSObject* operateOn = NULL );
void pushTime( size_t delay, const CStrW& fragment, JSObject* operateOn = NULL );
void pushFrame( size_t delay, const CStrW& fragment, JSObject* operateOn = NULL );
void pushInterval( size_t first, size_t interval, const CStrW& fragment, JSObject* operateOn = NULL );
void pushTime( size_t delay, JSFunction* function, JSObject* operateOn = NULL );
void pushFrame( size_t delay, JSFunction* function, JSObject* operateOn = NULL );
void pushInterval( size_t first, size_t interval, JSFunction* function, JSObject* operateOn = NULL );