diff options
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 3 | ||||
| -rw-r--r-- | source/gameengine/Expressions/EXP_BoolValue.h | 2 | ||||
| -rw-r--r-- | source/gameengine/Expressions/EXP_Value.h | 2 | ||||
| -rw-r--r-- | source/gameengine/Expressions/intern/InputParser.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/GameLogic/SCA_KeyboardSensor.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/GameLogic/SCA_MouseSensor.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_Dome.cpp | 16 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_KetsjiEngine.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_MouseFocusSensor.cpp | 8 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_RadarSensor.cpp | 6 | ||||
| -rw-r--r-- | source/gameengine/Network/NG_NetworkScene.h | 2 | ||||
| -rw-r--r-- | source/gameengine/SceneGraph/SG_Spatial.h | 2 |
13 files changed, 29 insertions, 28 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 22616458b54..84cbf4bf85b 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -110,7 +110,8 @@ static BlendFileData *load_game_data(const char *filename) BlendFileData *bfd; BKE_reports_init(&reports, RPT_STORE); - bfd= BLO_read_from_file(filename, &reports, BLO_READ_SKIP_USERDEF); + bfd= BLO_read_from_file(filename, BLO_READ_SKIP_USERDEF, &reports); + if (!bfd) { printf("Loading %s failed: ", filename); diff --git a/source/gameengine/Expressions/EXP_BoolValue.h b/source/gameengine/Expressions/EXP_BoolValue.h index 89c724e87ee..2b8c909a0ba 100644 --- a/source/gameengine/Expressions/EXP_BoolValue.h +++ b/source/gameengine/Expressions/EXP_BoolValue.h @@ -22,7 +22,7 @@ #include "EXP_Value.h" /** - * Smart Boolean Value class. + * Smart Boolean Value class. * Is used by parser when an expression tree is build containing booleans. */ diff --git a/source/gameengine/Expressions/EXP_Value.h b/source/gameengine/Expressions/EXP_Value.h index dd0cee3dbb8..78e0303b0ad 100644 --- a/source/gameengine/Expressions/EXP_Value.h +++ b/source/gameengine/Expressions/EXP_Value.h @@ -141,7 +141,7 @@ struct ValueFlags { }; /** - * Base Class for all Actions performed on CValue's. Can be extended for undo/redo system in future. + * Base Class for all Actions performed on CValue's. Can be extended for undo/redo system in future. */ class CAction { diff --git a/source/gameengine/Expressions/intern/InputParser.cpp b/source/gameengine/Expressions/intern/InputParser.cpp index 1f5f9800a33..4c1697c22c7 100644 --- a/source/gameengine/Expressions/intern/InputParser.cpp +++ b/source/gameengine/Expressions/intern/InputParser.cpp @@ -417,7 +417,7 @@ int CParser::Priority(int optorkind) CExpression *CParser::Ex(int i) { - // parses an expression in the imput, starting at priority i, and + // parses an expression in the input, starting at priority i, and // returns an CExpression, containing the parsed input CExpression *e1 = NULL, *e2 = NULL; int opkind2; @@ -562,7 +562,7 @@ CExpression *CParser::Ex(int i) CExpression *CParser::Expr() { - // parses an expression in the imput, and + // parses an expression in the input, and // returns an CExpression, containing the parsed input return Ex(1); } diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp index a502158f453..66a5c5a2a5a 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp +++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp @@ -304,10 +304,10 @@ bool SCA_KeyboardSensor::Evaluate() * note, this will only change the results if key modifiers are set. * * When all modifiers and keys are positive - * - pulse true + * - pulse true * * When ANY of the modifiers or main key become inactive, - * - pulse false + * - pulse false */ if (qual==false) { /* one of the qualifiers are not pressed */ if (m_val_orig && qual_change) { /* we were originally enabled, but a qualifier changed */ diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.cpp b/source/gameengine/GameLogic/SCA_MouseSensor.cpp index c1ad1c4543a..f3a5269f3d7 100644 --- a/source/gameengine/GameLogic/SCA_MouseSensor.cpp +++ b/source/gameengine/GameLogic/SCA_MouseSensor.cpp @@ -202,7 +202,7 @@ bool SCA_MouseSensor::Evaluate() m_val = 0; result = true; } - else //KX_NO_IMPUTSTATUS + else// KX_NO_INPUTSTATUS { if (m_val == 1) { diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 42b603f8980..46b477a6da5 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -355,7 +355,7 @@ static BlendFileData *load_game_data(const char *progname, char *filename = NULL BLI_strncpy(bfd->main->name, progname, sizeof(bfd->main->name)); } } else { - bfd= BLO_read_from_file(progname, &reports, BLO_READ_SKIP_NONE); + bfd= BLO_read_from_file(progname, BLO_READ_SKIP_NONE, &reports); } if (!bfd && filename) { diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp index bfc8b6edf1b..2f8a94c3b50 100644 --- a/source/gameengine/Ketsji/KX_Dome.cpp +++ b/source/gameengine/Ketsji/KX_Dome.cpp @@ -457,13 +457,13 @@ bool KX_Dome::ParseWarpMesh(STR_String text) /* * //Notes about the supported data format: * File example:: - * mode - * width height - * n0_x n0_y n0_u n0_v n0_i - * n1_x n1_y n1_u n1_v n1_i - * n2_x n1_y n2_u n2_v n2_i - * n3_x n3_y n3_u n3_v n3_i - * (...) + * mode + * width height + * n0_x n0_y n0_u n0_v n0_i + * n1_x n1_y n1_u n1_v n1_i + * n2_x n1_y n2_u n2_v n2_i + * n3_x n3_y n3_u n3_v n3_i + * (...) * First line is the image type the mesh is support to be applied to: 2 = fisheye, 1=radial * The next line has the mesh dimensions * Rest of the lines are the nodes of the mesh. Each line has x y u v i @@ -535,7 +535,7 @@ bool KX_Dome::ParseWarpMesh(STR_String text) void KX_Dome::CreateMeshDome180(void) { /* - * 1)- Define the faces of half of a cube + * 1) Define the faces of half of a cube * - each face is made out of 2 triangles * 2) Subdivide the faces * - more resolution == more curved lines diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index 3592a67c8e4..e8fe056618e 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -105,7 +105,7 @@ short KX_KetsjiEngine::m_exitkey = 130; // ESC Key bool KX_KetsjiEngine::m_doRender = true; /** - * Constructor of the Ketsji Engine + * Constructor of the Ketsji Engine */ KX_KetsjiEngine::KX_KetsjiEngine(KX_ISystem* system) : m_canvas(NULL), @@ -189,7 +189,7 @@ KX_KetsjiEngine::KX_KetsjiEngine(KX_ISystem* system) /** - * Destructor of the Ketsji Engine, release all memory + * Destructor of the Ketsji Engine, release all memory */ KX_KetsjiEngine::~KX_KetsjiEngine() { diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp index 6dc85b59935..a9cd8bf4508 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp @@ -308,11 +308,11 @@ bool KX_MouseFocusSensor::ParentObjectHasFocusCamera(KX_Camera *cam) * _should_ be wrong! - see from point Z values */ - /* build the from and to point in normalized device coordinates - * Normalized device coordinates are [-1,1] in x, y, z + /* build the from and to point in normalized device coordinates + * Normalized device coordinates are [-1,1] in x, y, z * - * The actual z coordinates used don't have to be exact just infront and - * behind of the near and far clip planes. + * The actual z coordinates used don't have to be exact just infront and + * behind of the near and far clip planes. */ frompoint.setValue( (2 * (m_x-x_lb) / width) - 1.0f, 1.0f - (2 * (m_y_inv - y_lb) / height), diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp index 4f7a0e33011..6300a6ab0e4 100644 --- a/source/gameengine/Ketsji/KX_RadarSensor.cpp +++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp @@ -38,7 +38,7 @@ #include "DNA_sensor_types.h" /** - * RadarSensor constructor. Creates a near-sensor derived class, with a cone collision shape. + * RadarSensor constructor. Creates a near-sensor derived class, with a cone collision shape. */ KX_RadarSensor::KX_RadarSensor(SCA_EventManager* eventmgr, KX_GameObject* gameobj, @@ -84,8 +84,8 @@ CValue* KX_RadarSensor::GetReplica() } /** - * Transforms the collision object. A cone is not correctly centered - * for usage. */ + * Transforms the collision object. A cone is not correctly centered + * for usage. */ void KX_RadarSensor::SynchronizeTransform() { // Getting the parent location was commented out. Why? diff --git a/source/gameengine/Network/NG_NetworkScene.h b/source/gameengine/Network/NG_NetworkScene.h index e6233852ee2..d9985fe05c7 100644 --- a/source/gameengine/Network/NG_NetworkScene.h +++ b/source/gameengine/Network/NG_NetworkScene.h @@ -85,7 +85,7 @@ public: void RemoveAllObjects(); /** - * send a message (ascii text) over the network + * send a message (ascii text) over the network */ void SendMessage(const STR_String& to,const STR_String& from,const STR_String& subject,const STR_String& message); diff --git a/source/gameengine/SceneGraph/SG_Spatial.h b/source/gameengine/SceneGraph/SG_Spatial.h index 7fa21506675..504eccedea7 100644 --- a/source/gameengine/SceneGraph/SG_Spatial.h +++ b/source/gameengine/SceneGraph/SG_Spatial.h @@ -60,7 +60,7 @@ protected: MT_Matrix3x3 m_worldRotation; MT_Vector3 m_worldScaling; - SG_ParentRelation * m_parent_relation; + SG_ParentRelation *m_parent_relation; SG_BBox m_bbox; MT_Scalar m_radius; |