[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src clipboard.cpp game_events.cpp leade...
|
From: |
Yann Dirson |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/src clipboard.cpp game_events.cpp leade... |
|
Date: |
Wed, 23 Mar 2005 17:10:51 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 05/03/23 22:10:51
Modified files:
src : clipboard.cpp game_events.cpp leader_list.cpp
multiplayer_create.cpp multiplayer_ui.cpp
network.cpp network_worker.cpp race.cpp
race.hpp unit_display.cpp unit_types.cpp
unit_types.hpp
src/editor : scenario_editor.hpp
Log message:
dos2unix
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/clipboard.cpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.133&tr2=1.134&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/leader_list.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_create.cpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_ui.cpp.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network.cpp.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network_worker.cpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/race.cpp.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/race.hpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_display.cpp.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.cpp.diff?tr1=1.92&tr2=1.93&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.hpp.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/scenario_editor.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: wesnoth/src/clipboard.cpp
diff -u wesnoth/src/clipboard.cpp:1.16 wesnoth/src/clipboard.cpp:1.17
--- wesnoth/src/clipboard.cpp:1.16 Mon Mar 14 03:40:57 2005
+++ wesnoth/src/clipboard.cpp Wed Mar 23 22:10:50 2005
@@ -484,7 +484,7 @@
}
//convert newlines
- std::string str(buffer);
+ std::string str(buffer);
str.erase(std::remove(str.begin(),str.end(),'\r'),str.end());
GlobalUnlock(hglb);
Index: wesnoth/src/editor/scenario_editor.hpp
diff -u wesnoth/src/editor/scenario_editor.hpp:1.4
wesnoth/src/editor/scenario_editor.hpp:1.5
--- wesnoth/src/editor/scenario_editor.hpp:1.4 Fri Mar 11 02:33:37 2005
+++ wesnoth/src/editor/scenario_editor.hpp Wed Mar 23 22:10:51 2005
@@ -1,9 +1,9 @@
#ifndef SCENARIO_EDITOR_HPP_INCLUDED
#define SCENARIO_EDITOR_HPP_INCLUDED
-#include "../config.hpp"
+#include "../config.hpp"
#include "../display.hpp"
-#include "../events.hpp"
+#include "../events.hpp"
#include "../gamestatus.hpp"
#include "../hotkeys.hpp"
#include "../scoped_resource.hpp"
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.133 wesnoth/src/game_events.cpp:1.134
--- wesnoth/src/game_events.cpp:1.133 Tue Mar 22 23:42:36 2005
+++ wesnoth/src/game_events.cpp Wed Mar 23 22:10:50 2005
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.133 2005/03/22 23:42:36 ydirson Exp $ */
+/* $Id: game_events.cpp,v 1.134 2005/03/23 22:10:50 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -870,32 +870,32 @@
screen->recalculate_minimap();
screen->invalidate_all();
screen->rebuild_all();
- }
-
- //creating a mask of the terrain
- else if(cmd == "terrain_mask") {
- gamemap::location loc(cfg);
- if(loc.x == -1) {
- loc.x = 0;
- }
-
- if(loc.y == -1) {
- loc.y = 0;
- }
-
- gamemap mask(*game_map);
-
- try {
- mask.read(cfg["mask"]);
- } catch(gamemap::incorrect_format_exception&) {
- ERR_NG << "terrain mask is in the incorrect format, and
couldn't be applied\n";
- return rval;
- }
-
- game_map->overlay(mask,cfg,loc.x,loc.y);
- screen->recalculate_minimap();
- screen->invalidate_all();
- screen->rebuild_all();
+ }
+
+ //creating a mask of the terrain
+ else if(cmd == "terrain_mask") {
+ gamemap::location loc(cfg);
+ if(loc.x == -1) {
+ loc.x = 0;
+ }
+
+ if(loc.y == -1) {
+ loc.y = 0;
+ }
+
+ gamemap mask(*game_map);
+
+ try {
+ mask.read(cfg["mask"]);
+ } catch(gamemap::incorrect_format_exception&) {
+ ERR_NG << "terrain mask is in the incorrect format, and
couldn't be applied\n";
+ return rval;
+ }
+
+ game_map->overlay(mask,cfg,loc.x,loc.y);
+ screen->recalculate_minimap();
+ screen->invalidate_all();
+ screen->rebuild_all();
}
//if we should spawn a new unit on the map somewhere
Index: wesnoth/src/leader_list.cpp
diff -u wesnoth/src/leader_list.cpp:1.10 wesnoth/src/leader_list.cpp:1.11
--- wesnoth/src/leader_list.cpp:1.10 Sat Mar 19 17:33:32 2005
+++ wesnoth/src/leader_list.cpp Wed Mar 23 22:10:50 2005
@@ -1,4 +1,4 @@
-/* $Id: leader_list.cpp,v 1.10 2005/03/19 17:33:32 gruikya Exp $ */
+/* $Id: leader_list.cpp,v 1.11 2005/03/23 22:10:50 ydirson Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -10,8 +10,8 @@
See the COPYING file for more details.
*/
-
-#include "global.hpp"
+
+#include "global.hpp"
#include "gettext.hpp"
#include "leader_list.hpp"
Index: wesnoth/src/multiplayer_create.cpp
diff -u wesnoth/src/multiplayer_create.cpp:1.17
wesnoth/src/multiplayer_create.cpp:1.18
--- wesnoth/src/multiplayer_create.cpp:1.17 Sat Mar 19 17:33:32 2005
+++ wesnoth/src/multiplayer_create.cpp Wed Mar 23 22:10:50 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_create.cpp,v 1.17 2005/03/19 17:33:32 gruikya Exp $ */
+/* $Id: multiplayer_create.cpp,v 1.18 2005/03/23 22:10:50 ydirson Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -10,8 +10,8 @@
See the COPYING file for more details.
*/
-
-#include "global.hpp"
+
+#include "global.hpp"
#include "display.hpp"
#include "gettext.hpp"
Index: wesnoth/src/multiplayer_ui.cpp
diff -u wesnoth/src/multiplayer_ui.cpp:1.15 wesnoth/src/multiplayer_ui.cpp:1.16
--- wesnoth/src/multiplayer_ui.cpp:1.15 Sat Mar 19 17:59:13 2005
+++ wesnoth/src/multiplayer_ui.cpp Wed Mar 23 22:10:50 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_ui.cpp,v 1.15 2005/03/19 17:59:13 gruikya Exp $ */
+/* $Id: multiplayer_ui.cpp,v 1.16 2005/03/23 22:10:50 ydirson Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -10,8 +10,8 @@
See the COPYING file for more details.
*/
-
-#include "global.hpp"
+
+#include "global.hpp"
#include "display.hpp"
#include "gettext.hpp"
Index: wesnoth/src/network.cpp
diff -u wesnoth/src/network.cpp:1.56 wesnoth/src/network.cpp:1.57
--- wesnoth/src/network.cpp:1.56 Mon Mar 21 01:33:36 2005
+++ wesnoth/src/network.cpp Wed Mar 23 22:10:50 2005
@@ -1,6 +1,6 @@
#include "global.hpp"
-
-#include "serialization/binary_wml.hpp"
+
+#include "serialization/binary_wml.hpp"
#include "config.hpp"
#include "log.hpp"
#include "network.hpp"
@@ -274,7 +274,7 @@
waiting_sockets.insert(connect);
- sockets.push_back(connect);
+ sockets.push_back(connect);
wassert(schemas.count(connect) == 0);
schemas.insert(std::pair<network::connection,schema_pair>(connect,schema_pair()));
@@ -365,7 +365,7 @@
}
waiting_sockets.insert(connect);
- sockets.push_back(connect);
+ sockets.push_back(connect);
wassert(schemas.count(connect) == 0);
schemas.insert(std::pair<network::connection,schema_pair>(connect,schema_pair()));
return connect;
Index: wesnoth/src/network_worker.cpp
diff -u wesnoth/src/network_worker.cpp:1.23 wesnoth/src/network_worker.cpp:1.24
--- wesnoth/src/network_worker.cpp:1.23 Mon Mar 21 01:33:36 2005
+++ wesnoth/src/network_worker.cpp Wed Mar 23 22:10:50 2005
@@ -107,7 +107,7 @@
for(; itor != itor_end; ++itor) {
socket_state_map::iterator lock_it =
sockets_locked.find((*itor)->sock);
wassert(lock_it !=
sockets_locked.end());
- if(lock_it->second == SOCKET_READY) {
+ if(lock_it->second == SOCKET_READY) {
lock_it->second = SOCKET_LOCKED;
sent_buf = *itor;
sock = sent_buf->sock;
@@ -121,7 +121,7 @@
for(; itor != itor_end; ++itor) {
socket_state_map::iterator
lock_it = sockets_locked.find(*itor);
wassert(lock_it !=
sockets_locked.end());
- if(lock_it->second ==
SOCKET_READY) {
+ if(lock_it->second ==
SOCKET_READY) {
lock_it->second =
SOCKET_LOCKED;
sock = *itor;
pending_receives.erase(itor);
@@ -228,8 +228,8 @@
delete global_mutex;
delete cond;
global_mutex = NULL;
- cond = NULL;
-
+ cond = NULL;
+
sockets_locked.clear();
LOG_NW << "exiting manager::~manager()\n";
Index: wesnoth/src/race.cpp
diff -u wesnoth/src/race.cpp:1.18 wesnoth/src/race.cpp:1.19
--- wesnoth/src/race.cpp:1.18 Tue Mar 22 22:09:28 2005
+++ wesnoth/src/race.cpp Wed Mar 23 22:10:50 2005
@@ -100,7 +100,7 @@
}
unit_race::unit_race(const config& cfg) : name_(cfg["name"]),
ntraits_(atoi(cfg["num_traits"].c_str())),
- not_living_(cfg["not_living"] ==
"yes"),
+ not_living_(cfg["not_living"] ==
"yes"),
traits_(&cfg.get_children("trait")),
global_traits_(cfg["ignore_global_traits"] != "yes")
{
names_[MALE] = utils::split(cfg["male_names"]);
@@ -120,16 +120,16 @@
{
return
utils::wstring_to_string(markov_generate_name(next_[gender],chain_size_,12));
}
-
-bool unit_race::uses_global_traits() const
-{
- return global_traits_;
-}
-
-const config::child_list& unit_race::additional_traits() const
-{
- return *traits_;
-}
+
+bool unit_race::uses_global_traits() const
+{
+ return global_traits_;
+}
+
+const config::child_list& unit_race::additional_traits() const
+{
+ return *traits_;
+}
int unit_race::num_traits() const { return ntraits_; }
Index: wesnoth/src/race.hpp
diff -u wesnoth/src/race.hpp:1.7 wesnoth/src/race.hpp:1.8
--- wesnoth/src/race.hpp:1.7 Fri Mar 11 02:40:00 2005
+++ wesnoth/src/race.hpp Wed Mar 23 22:10:50 2005
@@ -21,9 +21,9 @@
const std::string& name() const;
std::string generate_name(GENDER gender) const;
-
- bool uses_global_traits() const;
-
+
+ bool uses_global_traits() const;
+
const config::child_list& additional_traits() const;
int num_traits() const;
@@ -36,9 +36,9 @@
markov_prefix_map next_[NUM_GENDERS];
int chain_size_;
- bool not_living_;
-
- const config::child_list* traits_;
+ bool not_living_;
+
+ const config::child_list* traits_;
bool global_traits_;
};
Index: wesnoth/src/unit_display.cpp
diff -u wesnoth/src/unit_display.cpp:1.55 wesnoth/src/unit_display.cpp:1.56
--- wesnoth/src/unit_display.cpp:1.55 Tue Mar 22 23:42:37 2005
+++ wesnoth/src/unit_display.cpp Wed Mar 23 22:10:50 2005
@@ -277,32 +277,32 @@
const std::string& die_sound = u.type().die_sound();
if(die_sound != "" && die_sound != "null") {
sound::play_sound(die_sound);
- }
-
- surface unit_image(NULL);
-
- const unit_animation* const anim_ptr = u.type().die_animation(attack);
- if(anim_ptr != NULL) {
- unit_animation anim(*anim_ptr);
-
-
anim.start_animation(anim.get_first_frame_time(),unit_animation::UNIT_FRAME,disp.turbo()
? 5:1);
- anim.update_current_frames();
-
- while(!anim.animation_finished()) {
-
- const unit_animation::frame& frame =
anim.get_current_frame();
-
- const surface surf(image::get_image(frame.image));
- if(surf.get() != NULL) {
- unit_image = surf;
- }
- disp.draw_tile(loc.x,loc.y,unit_image);
- disp.update_display();
-
- SDL_Delay(10);
-
- anim.update_current_frames();
- }
+ }
+
+ surface unit_image(NULL);
+
+ const unit_animation* const anim_ptr = u.type().die_animation(attack);
+ if(anim_ptr != NULL) {
+ unit_animation anim(*anim_ptr);
+
+
anim.start_animation(anim.get_first_frame_time(),unit_animation::UNIT_FRAME,disp.turbo()
? 5:1);
+ anim.update_current_frames();
+
+ while(!anim.animation_finished()) {
+
+ const unit_animation::frame& frame =
anim.get_current_frame();
+
+ const surface surf(image::get_image(frame.image));
+ if(surf.get() != NULL) {
+ unit_image = surf;
+ }
+ disp.draw_tile(loc.x,loc.y,unit_image);
+ disp.update_display();
+
+ SDL_Delay(10);
+
+ anim.update_current_frames();
+ }
}
const int frame_time = 30;
Index: wesnoth/src/unit_types.cpp
diff -u wesnoth/src/unit_types.cpp:1.92 wesnoth/src/unit_types.cpp:1.93
--- wesnoth/src/unit_types.cpp:1.92 Wed Mar 23 08:24:05 2005
+++ wesnoth/src/unit_types.cpp Wed Mar 23 22:10:51 2005
@@ -1,4 +1,4 @@
-/* $Id: unit_types.cpp,v 1.92 2005/03/23 08:24:05 silene Exp $ */
+/* $Id: unit_types.cpp,v 1.93 2005/03/23 22:10:51 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -578,14 +578,14 @@
const race_map::const_iterator race_it = races.find(cfg["race"]);
if(race_it != races.end()) {
- race_ = &race_it->second;
- if(race_ != NULL) {
- if(race_->uses_global_traits() == false) {
- possibleTraits_.clear();
- }
-
- const config::child_list& traits =
race_->additional_traits();
-
possibleTraits_.insert(possibleTraits_.end(),traits.begin(),traits.end());
+ race_ = &race_it->second;
+ if(race_ != NULL) {
+ if(race_->uses_global_traits() == false) {
+ possibleTraits_.clear();
+ }
+
+ const config::child_list& traits =
race_->additional_traits();
+
possibleTraits_.insert(possibleTraits_.end(),traits.begin(),traits.end());
}
} else {
static const unit_race dummy_race;
@@ -656,11 +656,11 @@
const config::child_list& teleports =
cfg_.get_children("teleport_anim");
for(config::child_list::const_iterator t = teleports.begin(); t !=
teleports.end(); ++t) {
teleport_animations_.push_back(unit_animation(**t));
- }
-
- const config::child_list& deaths = cfg_.get_children("death");
- for(config::child_list::const_iterator death = deaths.begin(); death !=
deaths.end(); ++death) {
- death_animations_.push_back(death_animation(**death));
+ }
+
+ const config::child_list& deaths = cfg_.get_children("death");
+ for(config::child_list::const_iterator death = deaths.begin(); death !=
deaths.end(); ++death) {
+ death_animations_.push_back(death_animation(**death));
}
}
@@ -1046,50 +1046,50 @@
} else {
return true;
}
-}
-
-unit_type::death_animation::death_animation(const config& cfg)
-: damage_type(utils::split(cfg["damage_type"])),
special(utils::split(cfg["attack_special"])), animation(cfg)
-{
-}
-
-bool unit_type::death_animation::matches(const attack_type* attack) const
-{
- if(attack == NULL) {
- return true;
- }
-
- if(damage_type.empty() == false &&
std::find(damage_type.begin(),damage_type.end(),attack->type()) ==
damage_type.end()) {
- return false;
- }
-
- if(special.empty() == false &&
std::find(special.begin(),special.end(),attack->special()) == special.end()) {
- return false;
- }
-
- return true;
+}
+
+unit_type::death_animation::death_animation(const config& cfg)
+: damage_type(utils::split(cfg["damage_type"])),
special(utils::split(cfg["attack_special"])), animation(cfg)
+{
+}
+
+bool unit_type::death_animation::matches(const attack_type* attack) const
+{
+ if(attack == NULL) {
+ return true;
+ }
+
+ if(damage_type.empty() == false &&
std::find(damage_type.begin(),damage_type.end(),attack->type()) ==
damage_type.end()) {
+ return false;
+ }
+
+ if(special.empty() == false &&
std::find(special.begin(),special.end(),attack->special()) == special.end()) {
+ return false;
+ }
+
+ return true;
}
const unit_animation* unit_type::defend_animation(bool hits,
attack_type::RANGE range) const
-{
- //select one of the matching animations at random
- const unit_animation* res = NULL;
+{
+ //select one of the matching animations at random
+ const unit_animation* res = NULL;
std::vector<const unit_animation*> options;
for(std::vector<defensive_animation>::const_iterator i =
defensive_animations_.begin(); i != defensive_animations_.end(); ++i) {
- if(i->matches(hits,range)) {
- if(res != NULL) {
- options.push_back(res);
- }
-
+ if(i->matches(hits,range)) {
+ if(res != NULL) {
+ options.push_back(res);
+ }
+
res = &i->animation;
}
- }
-
- if(options.empty()) {
- return res;
- } else {
- options.push_back(res);
- return options[rand()%options.size()];
+ }
+
+ if(options.empty()) {
+ return res;
+ } else {
+ options.push_back(res);
+ return options[rand()%options.size()];
}
}
@@ -1097,36 +1097,36 @@
{
if (teleport_animations_.empty()) return NULL;
return &teleport_animations_[rand() % teleport_animations_.size()];
-}
-
-const unit_animation* unit_type::die_animation(const attack_type* attack) const
-{
- if(death_animations_.empty()) {
- return NULL;
- }
-
- if(attack == NULL) {
- return
&death_animations_[rand()%death_animations_.size()].animation;
- }
-
- const unit_animation* res = NULL;
- std::vector<const unit_animation*> options;
- for(std::vector<death_animation>::const_iterator i =
death_animations_.begin(); i != death_animations_.end(); ++i) {
- if(i->matches(attack)) {
- if(res != NULL) {
- options.push_back(res);
- }
-
- res = &i->animation;
- }
- }
-
- if(options.empty()) {
- return res;
- } else {
- options.push_back(res);
- return options[rand()%options.size()];
- }
+}
+
+const unit_animation* unit_type::die_animation(const attack_type* attack) const
+{
+ if(death_animations_.empty()) {
+ return NULL;
+ }
+
+ if(attack == NULL) {
+ return
&death_animations_[rand()%death_animations_.size()].animation;
+ }
+
+ const unit_animation* res = NULL;
+ std::vector<const unit_animation*> options;
+ for(std::vector<death_animation>::const_iterator i =
death_animations_.begin(); i != death_animations_.end(); ++i) {
+ if(i->matches(attack)) {
+ if(res != NULL) {
+ options.push_back(res);
+ }
+
+ res = &i->animation;
+ }
+ }
+
+ if(options.empty()) {
+ return res;
+ } else {
+ options.push_back(res);
+ return options[rand()%options.size()];
+ }
}
game_data::game_data()
Index: wesnoth/src/unit_types.hpp
diff -u wesnoth/src/unit_types.hpp:1.64 wesnoth/src/unit_types.hpp:1.65
--- wesnoth/src/unit_types.hpp:1.64 Wed Mar 23 08:24:05 2005
+++ wesnoth/src/unit_types.hpp Wed Mar 23 22:10:51 2005
@@ -1,4 +1,4 @@
-/* $Id: unit_types.hpp,v 1.64 2005/03/23 08:24:05 silene Exp $ */
+/* $Id: unit_types.hpp,v 1.65 2005/03/23 22:10:51 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -244,7 +244,7 @@
const std::string& race() const;
const unit_animation* defend_animation(bool hits, attack_type::RANGE
range) const;
- const unit_animation* teleport_animation() const;
+ const unit_animation* teleport_animation() const;
const unit_animation* die_animation(const attack_type* attack) const;
private:
@@ -295,17 +295,17 @@
std::vector<defensive_animation> defensive_animations_;
- std::vector<unit_animation> teleport_animations_;
-
- struct death_animation
- {
- explicit death_animation(const config& cfg);
- bool matches(const attack_type* attack) const;
-
- std::vector<std::string> damage_type, special;
- unit_animation animation;
- };
-
+ std::vector<unit_animation> teleport_animations_;
+
+ struct death_animation
+ {
+ explicit death_animation(const config& cfg);
+ bool matches(const attack_type* attack) const;
+
+ std::vector<std::string> damage_type, special;
+ unit_animation animation;
+ };
+
std::vector<death_animation> death_animations_;
};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src clipboard.cpp game_events.cpp leade...,
Yann Dirson <=