mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

New economic tutorial based on triggers, accessible from the "learn to play" button

Browse Source 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D194
This was SVN commit r19599.
This commit is contained in:
mimo
2017-05-17 17:33:36 +00:00
parent 7dd3cf7543
commit 15e2b42525
12 changed files with 539 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/scripting/MessageTypeConversions.cpp
+6 -7
View File
@@ -14,7 +14,6 @@
* You should have received a copy of the GNU General Public License
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
#include "precompiled.h"
#include "ps/CLogger.h"
@@ -145,16 +144,16 @@ CMessage* CMessageProgressiveLoad::FromJSVal(ScriptInterface& UNUSED(scriptInter
////////////////////////////////
JS::Value CMessageDeserialized::ToJSVal(ScriptInterface& UNUSED(scriptInterface)) const
JS::Value CMessageDeserialized::ToJSVal(ScriptInterface& scriptInterface) const
{
LOGWARNING("CMessageDeserialized::ToJSVal not implemented");
return JS::UndefinedValue();
TOJSVAL_SETUP();
return JS::ObjectValue(*obj);
}
CMessage* CMessageDeserialized::FromJSVal(ScriptInterface& UNUSED(scriptInterface), JS::HandleValue UNUSED(val))
CMessage* CMessageDeserialized::FromJSVal(ScriptInterface& scriptInterface, JS::HandleValue val)
{
LOGWARNING("CMessageDeserialized::FromJSVal not implemented");
return NULL;
FROMJSVAL_SETUP();
return new CMessageDeserialized();
}
////////////////////////////////