mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
7b4988dee1
* rulesets/PythonArithmeticScript.cpp, rulesets/PythonThingScript.cpp: Add casts when passing string constants to Python calls which take char *. I am confident this is safe, and the functions have no need to modify the strings, so could take const char *, but somehow don't.
68 lines
2.1 KiB
C++
68 lines
2.1 KiB
C++
// Cyphesis Online RPG Server and AI Engine
|
|
// Copyright (C) 2005 Alistair Riddoch
|
|
//
|
|
// This program is free software; you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation; either version 2 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program; if not, write to the Free Software Foundation,
|
|
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
// $Id$
|
|
|
|
#include <Python.h>
|
|
|
|
#include "PythonArithmeticScript.h"
|
|
|
|
#include "common/log.h"
|
|
|
|
#include <iostream>
|
|
|
|
/// \brief PythonArithmeticScript
|
|
///
|
|
/// @param script Python instance object implementing the script
|
|
PythonArithmeticScript::PythonArithmeticScript(PyObject * script) :
|
|
m_script(script)
|
|
{
|
|
}
|
|
|
|
PythonArithmeticScript::~PythonArithmeticScript()
|
|
{
|
|
Py_DECREF(m_script);
|
|
}
|
|
|
|
int PythonArithmeticScript::attribute(const std::string & name, float & val)
|
|
{
|
|
PyObject * py_name = PyString_FromString(name.c_str());
|
|
PyObject * ret = PyObject_CallMethod(m_script,
|
|
(char *)"attribute",
|
|
(char *)"(O)", py_name);
|
|
Py_DECREF(py_name);
|
|
if (ret == NULL) {
|
|
if (PyErr_Occurred() == NULL) {
|
|
// std::cout << "No attribute method" << std::endl << std::flush;
|
|
} else {
|
|
log(ERROR, "Reporting python error");
|
|
PyErr_Print();
|
|
}
|
|
return -1;
|
|
}
|
|
if (PyFloat_Check(ret)) {
|
|
val = PyFloat_AsDouble(ret);
|
|
} else if (PyInt_Check(ret)) {
|
|
val = PyInt_AsLong(ret);
|
|
} else if (ret == Py_None) {
|
|
return -1;
|
|
} else {
|
|
log(ERROR, "Invalid response from script");
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|